Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] docker: refactor, update, segment
@ 2021-03-08 18:30 endigma
  2021-03-08 18:56 ` endigma
                   ` (95 more replies)
  0 siblings, 96 replies; 97+ messages in thread
From: endigma @ 2021-03-08 18:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]

There is a new pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 13142 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/3] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/3] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/3] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
@ 2021-03-08 18:56 ` endigma
  2021-03-08 19:08 ` [PR PATCH] [Updated] " endigma
                   ` (94 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-08 18:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-792992028

Comment:
We don't know how to fix the ARM build fail, help appreciated.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
  2021-03-08 18:56 ` endigma
@ 2021-03-08 19:08 ` endigma
  2021-03-08 19:10 ` endigma
                   ` (93 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-08 19:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 14269 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/4] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/4] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/4] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 4/4] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
  2021-03-08 18:56 ` endigma
  2021-03-08 19:08 ` [PR PATCH] [Updated] " endigma
@ 2021-03-08 19:10 ` endigma
  2021-03-08 19:10 ` endigma
                   ` (92 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-08 19:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 14992 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/5] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/5] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/5] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 4/5] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 5/5] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (2 preceding siblings ...)
  2021-03-08 19:10 ` endigma
@ 2021-03-08 19:10 ` endigma
  2021-03-08 19:12 ` [PR PATCH] [Updated] " endigma
                   ` (91 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-08 19:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-792992028

Comment:
We don't know how to fix the ARM build fail, help appreciated.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (3 preceding siblings ...)
  2021-03-08 19:10 ` endigma
@ 2021-03-08 19:12 ` endigma
  2021-03-08 19:36 ` endigma
                   ` (90 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-08 19:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 14992 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/5] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/5] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/5] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 4/5] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 5/5] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (4 preceding siblings ...)
  2021-03-08 19:12 ` [PR PATCH] [Updated] " endigma
@ 2021-03-08 19:36 ` endigma
  2021-03-08 19:37 ` endigma
                   ` (89 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-08 19:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 18903 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/7] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/7] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/7] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 4/7] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 5/7] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 6/7] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 75127a874ed1e66b83f5e4f3d67dc32e358d4f6b Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:36:00 -0400
Subject: [PATCH 7/7] browserpass: update to 3.0.7.

---
 srcpkgs/browserpass/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index b6426a24975..e16b550082a 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -6,7 +6,7 @@ wrksrc="browserpass-native-${version}"
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 hostmakedepends="git"
-short_desc="Browser extension for pass"
+short_desc="Native messaging host for browserpass"
 maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://github.com/browserpass/browserpass-native"
@@ -20,14 +20,8 @@ post_build() {
 
 post_install() {
 	vlicense LICENSE
-
 	local targetname=com.github.browserpass.native.json
-
 	vinstall browser-files/firefox-host.json 644 usr/lib/mozilla/native-messaging-hosts $targetname
-
 	vinstall browser-files/chromium-host.json 644 etc/chromium/native-messaging-hosts $targetname
-	vinstall browser-files/chromium-policy.json 644 etc/chromium/policies/managed $targetname
-
 	vinstall browser-files/chromium-host.json 644 etc/opt/chrome/native-messaging-hosts $targetname
-	vinstall browser-files/chromium-policy.json 644 etc/opt/chrome/policies/managed $targetname
-}
+}
\ No newline at end of file

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (5 preceding siblings ...)
  2021-03-08 19:36 ` endigma
@ 2021-03-08 19:37 ` endigma
  2021-03-08 19:38 ` endigma
                   ` (88 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-08 19:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 19733 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/8] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/8] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/8] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 4/8] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 5/8] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 6/8] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 75127a874ed1e66b83f5e4f3d67dc32e358d4f6b Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:36:00 -0400
Subject: [PATCH 7/8] browserpass: update to 3.0.7.

---
 srcpkgs/browserpass/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index b6426a24975..e16b550082a 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -6,7 +6,7 @@ wrksrc="browserpass-native-${version}"
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 hostmakedepends="git"
-short_desc="Browser extension for pass"
+short_desc="Native messaging host for browserpass"
 maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://github.com/browserpass/browserpass-native"
@@ -20,14 +20,8 @@ post_build() {
 
 post_install() {
 	vlicense LICENSE
-
 	local targetname=com.github.browserpass.native.json
-
 	vinstall browser-files/firefox-host.json 644 usr/lib/mozilla/native-messaging-hosts $targetname
-
 	vinstall browser-files/chromium-host.json 644 etc/chromium/native-messaging-hosts $targetname
-	vinstall browser-files/chromium-policy.json 644 etc/chromium/policies/managed $targetname
-
 	vinstall browser-files/chromium-host.json 644 etc/opt/chrome/native-messaging-hosts $targetname
-	vinstall browser-files/chromium-policy.json 644 etc/opt/chrome/policies/managed $targetname
-}
+}
\ No newline at end of file

From 89befd199da9e4b9ecd8faa2c146b61cd93e0c22 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:37:05 -0400
Subject: [PATCH 8/8] browserpass: update to 3.0.7.

---
 srcpkgs/browserpass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index e16b550082a..2dcb41ef7e2 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -24,4 +24,4 @@ post_install() {
 	vinstall browser-files/firefox-host.json 644 usr/lib/mozilla/native-messaging-hosts $targetname
 	vinstall browser-files/chromium-host.json 644 etc/chromium/native-messaging-hosts $targetname
 	vinstall browser-files/chromium-host.json 644 etc/opt/chrome/native-messaging-hosts $targetname
-}
\ No newline at end of file
+}

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (6 preceding siblings ...)
  2021-03-08 19:37 ` endigma
@ 2021-03-08 19:38 ` endigma
  2021-03-11 21:04 ` [PR REVIEW] " ericonr
                   ` (87 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-08 19:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 17414 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/6] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/6] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/6] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 4/6] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 5/6] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 6/6] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (7 preceding siblings ...)
  2021-03-08 19:38 ` endigma
@ 2021-03-11 21:04 ` ericonr
  2021-03-11 21:04 ` ericonr
                   ` (86 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ericonr @ 2021-03-11 21:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592720041

Comment:
This is pretty much all platforms we build Go applications for? Not sure it makes sense to restrict...

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (8 preceding siblings ...)
  2021-03-11 21:04 ` [PR REVIEW] " ericonr
@ 2021-03-11 21:04 ` ericonr
  2021-03-11 21:04 ` ericonr
                   ` (85 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ericonr @ 2021-03-11 21:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592720369

Comment:
Not necessary after #28825 is fixed. Can be left out.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (9 preceding siblings ...)
  2021-03-11 21:04 ` ericonr
@ 2021-03-11 21:04 ` ericonr
  2021-03-11 21:04 ` ericonr
                   ` (84 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ericonr @ 2021-03-11 21:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592719724

Comment:
```suggestion
homepage="http://www.docker.io"
distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
system_groups="docker"
```

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (10 preceding siblings ...)
  2021-03-11 21:04 ` ericonr
@ 2021-03-11 21:04 ` ericonr
  2021-03-11 21:04 ` ericonr
                   ` (83 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ericonr @ 2021-03-11 21:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-797047983

Comment:
Remember to squash commits as well.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (11 preceding siblings ...)
  2021-03-11 21:04 ` ericonr
@ 2021-03-11 21:04 ` ericonr
  2021-03-11 23:56 ` [PR REVIEW] " endigma
                   ` (82 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ericonr @ 2021-03-11 21:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-797047983

Comment:
Remember to squash commits as well (per package).

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (12 preceding siblings ...)
  2021-03-11 21:04 ` ericonr
@ 2021-03-11 23:56 ` endigma
  2021-03-12  0:00 ` endigma
                   ` (81 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-11 23:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592813818

Comment:
this is actually future proofing according to the alpine package

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (13 preceding siblings ...)
  2021-03-11 23:56 ` [PR REVIEW] " endigma
@ 2021-03-12  0:00 ` endigma
  2021-03-12  0:00 ` endigma
                   ` (80 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592815734

Comment:
I don't get where this is coming from, the template for the docker-cli package looks like this on my branch.

```shell
# Template file for 'docker-cli'
pkgname=docker-cli
version=20.10.5
revision=1
create_wrksrc=yes
build_style=go
go_import_path="github.com/docker/cli"
hostmakedepends="pkg-config tar"
depends="containerd runc iptables xz git"
short_desc="Pack, ship and run any application as a lightweight container - cli"
maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
license="Apache-2.0"
homepage="http://www.docker.io"
system_groups="docker"

distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"

checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342

_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
_cli_builddir="cli-$version"

export GO111MODULE=off # go1.16 defaults to on

do_build() {
	export AUTO_GOPATH=1
	export GITCOMMIT=$_cli_commit
	export DISABLE_WARN_OUTSIDE_CONTAINER=1

	mkdir -p "$wrksrc/_cli_builddir"

	cd "$wrksrc/$_cli_builddir"
	mkdir -p src/github.com/docker/
	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
}

do_install() {
	vbin $_cli_builddir/build/docker
}

```

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (14 preceding siblings ...)
  2021-03-12  0:00 ` endigma
@ 2021-03-12  0:00 ` endigma
  2021-03-12  0:01 ` endigma
                   ` (79 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592815908

Comment:
Are you maybe browsing a past commit somehow?

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (15 preceding siblings ...)
  2021-03-12  0:00 ` endigma
@ 2021-03-12  0:01 ` endigma
  2021-03-12  0:02 ` [PR REVIEW] " endigma
                   ` (78 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-797137237

Comment:
Not sure what you mean regarding the service file.

https://github.com/endigma/void-packages/blob/master/srcpkgs/docker-engine/files/docker/run

github shows it as having the contents it should.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (16 preceding siblings ...)
  2021-03-12  0:01 ` endigma
@ 2021-03-12  0:02 ` endigma
  2021-03-12  0:02 ` endigma
                   ` (77 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592815734

Comment:
I don't get where this is coming from, the template for the docker-cli package looks like this on my branch.

```shell
# Template file for 'docker-cli'
pkgname=docker-cli
version=20.10.5
revision=1
create_wrksrc=yes
build_style=go
go_import_path="github.com/docker/cli"
hostmakedepends="pkg-config tar"
depends="containerd runc iptables xz git"
short_desc="Pack, ship and run any application as a lightweight container - cli"
maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
license="Apache-2.0"
homepage="http://www.docker.io"
system_groups="docker"

distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"

checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342

_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
_cli_builddir="cli-$version"

export GO111MODULE=off # go1.16 defaults to on

do_build() {
	export AUTO_GOPATH=1
	export GITCOMMIT=$_cli_commit
	export DISABLE_WARN_OUTSIDE_CONTAINER=1

	mkdir -p "$wrksrc/_cli_builddir"

	cd "$wrksrc/$_cli_builddir"
	mkdir -p src/github.com/docker/
	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
}

do_install() {
	vbin $_cli_builddir/build/docker
}

```

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (17 preceding siblings ...)
  2021-03-12  0:02 ` [PR REVIEW] " endigma
@ 2021-03-12  0:02 ` endigma
  2021-03-12  0:03 ` [PR PATCH] [Updated] " endigma
                   ` (76 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592815908

Comment:
Are you maybe browsing a past commit somehow?

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (18 preceding siblings ...)
  2021-03-12  0:02 ` endigma
@ 2021-03-12  0:03 ` endigma
  2021-03-12  0:05 ` endigma
                   ` (75 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 18564 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/7] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/7] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/7] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 4/7] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 5/7] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 6/7] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 7/7] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bd..555585e3f13 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (19 preceding siblings ...)
  2021-03-12  0:03 ` [PR PATCH] [Updated] " endigma
@ 2021-03-12  0:05 ` endigma
  2021-03-12  0:07 ` [PR PATCH] [Updated] " endigma
                   ` (74 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-797137237

Comment:
Not sure what you mean regarding the service file.

https://github.com/endigma/void-packages/blob/master/srcpkgs/docker-engine/files/docker/run

github shows it as having the contents it should.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (20 preceding siblings ...)
  2021-03-12  0:05 ` endigma
@ 2021-03-12  0:07 ` endigma
  2021-03-12  0:13 ` endigma
                   ` (73 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 19572 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/8] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/8] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/8] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 4/8] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 5/8] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 6/8] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 7/8] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bd..555585e3f13 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 8/8] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (21 preceding siblings ...)
  2021-03-12  0:07 ` [PR PATCH] [Updated] " endigma
@ 2021-03-12  0:13 ` endigma
  2021-03-12  0:15 ` endigma
                   ` (72 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 32369 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 1/9] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 2/9] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 3/9] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 4/9] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 5/9] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 6/9] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 7/9] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bd..555585e3f13 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 8/9] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 9/9] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:07:20 2021 -0400

    Fixed the symlink in /log/

commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:03:00 2021 -0400

    Update srcpkgs/docker-cli/template

    Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>

commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:12:04 2021 -0400

    Remove unneeded newlines

commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:10:30 2021 -0400

    "Trailing Whitespace"

commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:07:59 2021 -0400

    Removed 'unset CC'

commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:33 2021 -0400

    New package: docker-engine-20.10.5

commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:29 2021 -0400

    docker: update to 20.10.5.

commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:26 2021 -0400

    New package: docker-cli-20.10.5
---
 srcpkgs/docker-cli/template                   |  39 +++++
 srcpkgs/docker-cli/update                     |   1 +
 .../files/docker/log/run                      |   0
 .../files/docker/run                          |   0
 srcpkgs/docker-engine/template                |  60 ++++++++
 srcpkgs/docker-engine/update                  |   1 +
 srcpkgs/docker/template                       | 142 +-----------------
 srcpkgs/docker/update                         |   1 -
 8 files changed, 108 insertions(+), 136 deletions(-)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
 rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..555585e3f13
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..0a72a884f5e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (22 preceding siblings ...)
  2021-03-12  0:13 ` endigma
@ 2021-03-12  0:15 ` endigma
  2021-03-12  0:25 ` [PR REVIEW] " sgn
                   ` (71 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  0:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-797142538

Comment:
> Remember to squash commits as well (per package).

I have absolutely no idea how to do this without breaking my fork into 3.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (23 preceding siblings ...)
  2021-03-12  0:15 ` endigma
@ 2021-03-12  0:25 ` sgn
  2021-03-12  1:03 ` [PR PATCH] [Updated] " endigma
                   ` (70 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: sgn @ 2021-03-12  0:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592824683

Comment:
If `distfiles` is a single file, please don't rename distfiles. We need to rename in old template because there are multiple of them and they may collide.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (24 preceding siblings ...)
  2021-03-12  0:25 ` [PR REVIEW] " sgn
@ 2021-03-12  1:03 ` endigma
  2021-03-12  2:00 ` [PR REVIEW] " ahesford
                   ` (69 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  1:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 33333 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 01/10] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 02/10] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 03/10] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 04/10] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 05/10] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 06/10] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 07/10] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bd..555585e3f13 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 08/10] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 09/10] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:07:20 2021 -0400

    Fixed the symlink in /log/

commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:03:00 2021 -0400

    Update srcpkgs/docker-cli/template

    Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>

commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:12:04 2021 -0400

    Remove unneeded newlines

commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:10:30 2021 -0400

    "Trailing Whitespace"

commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:07:59 2021 -0400

    Removed 'unset CC'

commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:33 2021 -0400

    New package: docker-engine-20.10.5

commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:29 2021 -0400

    docker: update to 20.10.5.

commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:26 2021 -0400

    New package: docker-cli-20.10.5
---
 srcpkgs/docker-cli/template                   |  39 +++++
 srcpkgs/docker-cli/update                     |   1 +
 .../files/docker/log/run                      |   0
 .../files/docker/run                          |   0
 srcpkgs/docker-engine/template                |  60 ++++++++
 srcpkgs/docker-engine/update                  |   1 +
 srcpkgs/docker/template                       | 142 +-----------------
 srcpkgs/docker/update                         |   1 -
 8 files changed, 108 insertions(+), 136 deletions(-)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
 rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..555585e3f13
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..0a72a884f5e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 5f5973ed0090b362ca42f40c2007afd35f384291 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 21:03:36 -0400
Subject: [PATCH 10/10] Un-named distfiles in single-distfile template

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 555585e3f13..3967e2019b9 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,7 +12,7 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (25 preceding siblings ...)
  2021-03-12  1:03 ` [PR PATCH] [Updated] " endigma
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (68 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592843268

Comment:
I don't think you need this. Just do
```shell
wrksrc="cli-${version}"
```

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (26 preceding siblings ...)
  2021-03-12  2:00 ` [PR REVIEW] " ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (67 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592844900

Comment:
The original `docker` template had to build multiple components in its custom `do_build`. Have you tried using the stanard `do_build` from the `go` build style? All the `make dynbinary` target does is call a script which sources an environment and then calls `go build`. You might be able just to the necessary variables directly here and use the standard behavior.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (27 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (66 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592845796

Comment:
This package should be named `moby`.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (28 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (65 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592843999

Comment:
The intermediate variable offers no benefit, just `export GITCOMMIT=55c4[...]` here. (If you can't drop the `do_build` custom function as I discuss below, then you might as well just define it outright within `do_build`.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (29 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (64 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592845096

Comment:
Especially if you can drop the custom `do_build`, I wonder if you can drop this custom function too.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (30 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (63 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592843750

Comment:
Not necessary with the `create_wrksrc` drop. 

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (32 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (61 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592850245

Comment:
Again,
```shell
pattern="v\K[\d\.]+(?=\.tar\.gz)"
```
should be sufficient here.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (31 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (62 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592845655

Comment:
This is probably overkill. Why not just
```shell
pattern="v\K[\d\.]+(?=\.tar\.gz)"
```

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (34 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (59 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592852313

Comment:
`short_desc="Command-line interface to the Docker container runtime"` captures the upstream description from the GitHub project page (which is just "The Docker CLI") with more detail but avoids the marketing speak.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (33 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:00 ` ahesford
                   ` (60 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 544 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592853045

Comment:
Is there really a hard run-time dependency on `git`? Should `docker-cli` depend on these backends, or is it more appropriate to depend on `moby`? (I use Docker very passively and am not sure how `docker-cli` would function without the `moby` engine.)

Even if depending on `containerd` instead of `moby` is appropriate, you can drop the `runc` dependency because `containerd` depends on `runc`.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (35 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:00 ` ahesford
  2021-03-12  2:19 ` ericonr
                   ` (58 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592848463

Comment:
`distfiles` and `checksum` should be right after `homepage` to follow the standard ordering, and use standard single-space indentation. Also, might as well put the moby url on the same line as `distfiles`, since that line will still be shorter than the libnetwork line anyway.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (36 preceding siblings ...)
  2021-03-12  2:00 ` ahesford
@ 2021-03-12  2:19 ` ericonr
  2021-03-12  3:35 ` endigma
                   ` (57 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ericonr @ 2021-03-12  2:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592864125

Comment:
We are setting it to `auto` for all packages, so it shouldn't be necessary. I'd prefer to add it only when actually needed.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (37 preceding siblings ...)
  2021-03-12  2:19 ` ericonr
@ 2021-03-12  3:35 ` endigma
  2021-03-12  3:39 ` endigma
                   ` (56 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592887694

Comment:
I've set it up as a meta-package because docker-cli doesn't explicitly require a local docker daemon, they can be networked.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (38 preceding siblings ...)
  2021-03-12  3:35 ` endigma
@ 2021-03-12  3:39 ` endigma
  2021-03-12  3:39 ` endigma
                   ` (55 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592888771

Comment:
I actually haven't updated this yet, I forgot to not include it.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (39 preceding siblings ...)
  2021-03-12  3:39 ` endigma
@ 2021-03-12  3:39 ` endigma
  2021-03-12  3:41 ` endigma
                   ` (54 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592888771

Comment:
I actually haven't updated this yet, I forgot to not include it. I'll add this now.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (40 preceding siblings ...)
  2021-03-12  3:39 ` endigma
@ 2021-03-12  3:41 ` endigma
  2021-03-12  3:42 ` endigma
                   ` (53 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592889323

Comment:
docker-engine and moby are synonyms as far as docker is concerned, they have a mirror set up from `docker/engine` to `moby/moby`. I figured I'd use this name so that queries for docker related packages return the correct results. Otherwise something like a dummy package might be required, and calling the package `moby` has no real benefit since nothing else depends on this sort of thing.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (41 preceding siblings ...)
  2021-03-12  3:41 ` endigma
@ 2021-03-12  3:42 ` endigma
  2021-03-12  3:47 ` endigma
                   ` (52 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592889694

Comment:
This is my mistake I believe, git is a hard dependency of the docker-cli, it uses it to pull packages and handle version tagging, this must have been left in from the split.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (42 preceding siblings ...)
  2021-03-12  3:42 ` endigma
@ 2021-03-12  3:47 ` endigma
  2021-03-12  3:47 ` endigma
                   ` (51 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 255 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592891062

Comment:
I'm going to leave these in as per your other comment about moving the commit variables up under `revision`.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (43 preceding siblings ...)
  2021-03-12  3:47 ` endigma
@ 2021-03-12  3:47 ` endigma
  2021-03-12  3:49 ` endigma
                   ` (50 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592891106

Comment:
Good idea, I'll add this.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (44 preceding siblings ...)
  2021-03-12  3:47 ` endigma
@ 2021-03-12  3:49 ` endigma
  2021-03-12  3:50 ` endigma
                   ` (49 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592891546

Comment:
I've revised this to `short_desc="Command-line interface to the Docker daemon"` as I feel as though it's less wordy and more accurate.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (45 preceding siblings ...)
  2021-03-12  3:49 ` endigma
@ 2021-03-12  3:50 ` endigma
  2021-03-12  3:57 ` endigma
                   ` (48 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592892023

Comment:
The docker cli is capable of communicating with any docker daemon, remotely or locally. This is why I set the package up as a meta, rather than strict dependencies. It is also practical in some cases to use the docker daemon without the docker CLI, such as when using a different device to control the daemon.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (46 preceding siblings ...)
  2021-03-12  3:50 ` endigma
@ 2021-03-12  3:57 ` endigma
  2021-03-12  4:00 ` endigma
                   ` (47 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  3:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 825 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592893607

Comment:
I attempted removing the custom do_build() and do_install() functions, however builds fail with the error:

```
=> ERROR: docker-cli-20.10.5_1: do_build: 'go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}' exited with 1
=> ERROR:   in do_build() at common/build-style/go.sh:39
```

when this is set. I don't know how to fix this, so I'm going to leave the custom functions in, as they compile just fine and I don't see how they could impact build performance if they are similar to the default. Feel free to tell me what the issue is here, as I don't have enough experience with the xbps build system to understand it at 2am.


^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (47 preceding siblings ...)
  2021-03-12  3:57 ` endigma
@ 2021-03-12  4:00 ` endigma
  2021-03-12  4:01 ` endigma
                   ` (46 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592887694

Comment:
I've set it up as a meta-package because docker-cli doesn't explicitly require a local docker daemon, they can be networked. The docker-engine package (mirror of moby) also doesn't require a cli to function.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (48 preceding siblings ...)
  2021-03-12  4:00 ` endigma
@ 2021-03-12  4:01 ` endigma
  2021-03-12  4:02 ` endigma
                   ` (45 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 729 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592889323

Comment:
docker-engine and moby are synonyms as far as docker is concerned, they have a mirror set up from `docker/engine` to `moby/moby`. I figured I'd use this name so that queries for docker related packages return the correct results. Otherwise something like a dummy package might be required, and calling the package `moby` has no real benefit since nothing else depends on this sort of thing.

I'll update the github url in the distfiles to be the docker/engine mirror as this may be more accurate for maintainers, as the `moby` repo may not always match with docker release cycles.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (49 preceding siblings ...)
  2021-03-12  4:01 ` endigma
@ 2021-03-12  4:02 ` endigma
  2021-03-12  4:02 ` endigma
                   ` (44 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592895067

Comment:
As mentioned in the other thread, I attempted this and failed, so for now I'll leave this as-is.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (50 preceding siblings ...)
  2021-03-12  4:02 ` endigma
@ 2021-03-12  4:02 ` endigma
  2021-03-12  4:14 ` endigma
                   ` (43 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592895193

Comment:
Implemented.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (51 preceding siblings ...)
  2021-03-12  4:02 ` endigma
@ 2021-03-12  4:14 ` endigma
  2021-03-12  4:14 ` endigma
                   ` (42 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592898398

Comment:
Implemented.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (52 preceding siblings ...)
  2021-03-12  4:14 ` endigma
@ 2021-03-12  4:14 ` endigma
  2021-03-12  4:21 ` endigma
                   ` (41 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592898435

Comment:
Implemented.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (53 preceding siblings ...)
  2021-03-12  4:14 ` endigma
@ 2021-03-12  4:21 ` endigma
  2021-03-12  4:22 ` endigma
                   ` (40 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592900471

Comment:
ahesford: you suggest a restructure of the package to be as follows correct?:

```
docker-cli
 -> docker (transitional package)
moby (docker-engine)
```

this isn't a horrible idea, but I think my approach is better for a few reasons:
1. the docker-cli doesn't depend on the docker container daemon, nor vice versa
2. some people may wish to install one of the two packages individually
3. as it stands, `docker` is a dummy package similar to `xorg` which provides all the tools one might expect or need.
4. renaming the engine package to moby may be more accurate to the repository used, however if someone queries the xbps repositories for docker related packages it might be better to name the package in relation to what it's normally used for. I've also updated the distfiles to be sourced from the `docker/engine` repository so in the event the versioning of these two projects ever differs the package should get the one compatible with other docker tools.

I'd love more input on how to improve things, and I've left responses on your suggested edits.
 

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (54 preceding siblings ...)
  2021-03-12  4:21 ` endigma
@ 2021-03-12  4:22 ` endigma
  2021-03-12  4:22 ` endigma
                   ` (39 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592900666

Comment:
See my larger response.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (55 preceding siblings ...)
  2021-03-12  4:22 ` endigma
@ 2021-03-12  4:22 ` endigma
  2021-03-12  4:23 ` endigma
                   ` (38 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592900723

Comment:
See my larger response.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (56 preceding siblings ...)
  2021-03-12  4:22 ` endigma
@ 2021-03-12  4:23 ` endigma
  2021-03-12  4:24 ` endigma
                   ` (37 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592900904

Comment:
Fixed.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (57 preceding siblings ...)
  2021-03-12  4:23 ` endigma
@ 2021-03-12  4:24 ` endigma
  2021-03-12  4:24 ` endigma
                   ` (36 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592901033

Comment:
See my larger response.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (58 preceding siblings ...)
  2021-03-12  4:24 ` endigma
@ 2021-03-12  4:24 ` endigma
  2021-03-12  4:30 ` ahesford
                   ` (35 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592901097

Comment:
See my larger response.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (59 preceding siblings ...)
  2021-03-12  4:24 ` endigma
@ 2021-03-12  4:30 ` ahesford
  2021-03-12  4:30 ` ahesford
                   ` (34 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  4:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 854 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592902844

Comment:
It looks like the latest tag on `docker/engine` is `v19.03.13`, while the upstream `moby/moby` has many later tags. I don't think switching the upstream makes sense.

Standard Void policy is to use the repo name for the package name, so `moby` is appropriate here. I suppose `docker-cli` is a really special case because `cli` is such a generic noun that it is really devoid of meaning, but `moby` is a proper noun here and identifies the project. Searching for `docker` with `xbps-query` will still turn up `moby` because "Docker" is included in the description.

If there is a compelling reason to use the `docker/engine` upstream or other members disagree about the naming, we can debate the policy.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (60 preceding siblings ...)
  2021-03-12  4:30 ` ahesford
@ 2021-03-12  4:30 ` ahesford
  2021-03-12  4:30 ` ahesford
                   ` (33 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  4:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592897415

Comment:
I'll take a look to see if there is an easy fix, but I'm not too worried about it if making the standard function work requires a massive effort.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (61 preceding siblings ...)
  2021-03-12  4:30 ` ahesford
@ 2021-03-12  4:30 ` ahesford
  2021-03-12  4:30 ` ahesford
                   ` (32 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  4:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 516 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592899086

Comment:
The meta-package is appropriate, but it can still be added as a subpackage of `docker-cli` by putting the following function in your `docker-cli` template:
```shell
docker_package() {
	build_style="meta"
	short_desc="Docker container runtime"
	depends="${sourcepkg}>=${version}_${revision} moby"
}
```
and make `srcpkgs/docker` a symbolic link to `docker-cli`.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (62 preceding siblings ...)
  2021-03-12  4:30 ` ahesford
@ 2021-03-12  4:30 ` ahesford
  2021-03-12  4:30 ` endigma
                   ` (31 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-12  4:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592899842

Comment:
Not depending on moby seems appropriate then. It also sounds like `containerd` and `runc` (and maybe `iptables?) should not be dependencies of `docker-cli` because people may wish to install `docker-cli` for controlling remote moby instances without pulling in underlying container runtimes.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (63 preceding siblings ...)
  2021-03-12  4:30 ` ahesford
@ 2021-03-12  4:30 ` endigma
  2021-03-12  4:34 ` [PR PATCH] [Updated] " endigma
                   ` (30 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592900471

Comment:
ahesford: you suggest a restructure of the package to be as follows correct?:

```
docker-cli
 -> docker (transitional package)
moby (docker-engine)
```

this isn't a horrible idea, but I think my approach is better for a few reasons:
1. the docker-cli doesn't depend on the docker container daemon, nor vice versa
2. some people may wish to install one of the two packages individually
3. as it stands, `docker` is a dummy package similar to `xorg` which provides all the tools one might expect or need.
4. renaming the engine package to moby may be more accurate to the repository used, however if someone queries the xbps repositories for docker related packages it might be better to name the package in relation to what it's normally used for. 

I noted in another thread that I'd update the upstream for `docker-engine` to be `docker/engine` however it seems for some reason the `20.10` release is not tagged, so I'll revert to the moby upstream. A good remedy for this might be making `docker-engine` a transitional package for `moby`?

I'd love more input on how to improve things, and I've left responses on your suggested edits.
 

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (64 preceding siblings ...)
  2021-03-12  4:30 ` endigma
@ 2021-03-12  4:34 ` endigma
  2021-03-12  4:36 ` endigma
                   ` (29 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 38017 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 01/11] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 02/11] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 03/11] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 04/11] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 05/11] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 06/11] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 07/11] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bd..555585e3f13 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 08/11] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 09/11] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:07:20 2021 -0400

    Fixed the symlink in /log/

commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:03:00 2021 -0400

    Update srcpkgs/docker-cli/template

    Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>

commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:12:04 2021 -0400

    Remove unneeded newlines

commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:10:30 2021 -0400

    "Trailing Whitespace"

commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:07:59 2021 -0400

    Removed 'unset CC'

commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:33 2021 -0400

    New package: docker-engine-20.10.5

commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:29 2021 -0400

    docker: update to 20.10.5.

commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:26 2021 -0400

    New package: docker-cli-20.10.5
---
 srcpkgs/docker-cli/template                   |  39 +++++
 srcpkgs/docker-cli/update                     |   1 +
 .../files/docker/log/run                      |   0
 .../files/docker/run                          |   0
 srcpkgs/docker-engine/template                |  60 ++++++++
 srcpkgs/docker-engine/update                  |   1 +
 srcpkgs/docker/template                       | 142 +-----------------
 srcpkgs/docker/update                         |   1 -
 8 files changed, 108 insertions(+), 136 deletions(-)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
 rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..555585e3f13
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..0a72a884f5e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 5f5973ed0090b362ca42f40c2007afd35f384291 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 21:03:36 -0400
Subject: [PATCH 10/11] Un-named distfiles in single-distfile template

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 555585e3f13..3967e2019b9 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,7 +12,7 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 

From ee7ea574f21df2012e43bd0d3411c4bec7daa6c9 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:34:17 -0400
Subject: [PATCH 11/11] Implemented suggestions from ahesford, along with a few
 changes.

---
 srcpkgs/docker-cli/template    | 19 ++++++-------------
 srcpkgs/docker-cli/update      |  2 +-
 srcpkgs/docker-engine/template | 20 +++++++-------------
 srcpkgs/docker-engine/update   |  2 +-
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 3967e2019b9..df84999e59b 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,13 +2,12 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-create_wrksrc=yes
 build_style=go
+wrksrc="cli-${version}"
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - cli"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
@@ -16,24 +15,18 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
-_cli_builddir="cli-$version"
-
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
-	export GITCOMMIT=$_cli_commit
+	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
-	mkdir -p "$wrksrc/_cli_builddir"
-
-	cd "$wrksrc/$_cli_builddir"
 	mkdir -p src/github.com/docker/
-	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	ln -sf "$wrksrc" src/github.com/docker/cli
 	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
 }
 
 do_install() {
-	vbin $_cli_builddir/build/docker
+	vbin build/docker
 }
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
index 47936e12584..2402ccb6eb5 100644
--- a/srcpkgs/docker-cli/update
+++ b/srcpkgs/docker-cli/update
@@ -1 +1 @@
-pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 0a72a884f5e..1c058305b03 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,39 +2,33 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - engine"
+depends="containerd iptables xz"
+short_desc="Engine for the Docker container daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
-
-distfiles="
-	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
 	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-
 checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
  9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
 
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
-_buildtags="seccomp"
 
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
-	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DOCKER_BUILDTAGS="seccomp"	#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 	mkdir -p "$wrksrc/$_moby_builddir"
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
index 6e08485891e..3ff71c71f1f 100644
--- a/srcpkgs/docker-engine/update
+++ b/srcpkgs/docker-engine/update
@@ -1 +1 @@
-pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (65 preceding siblings ...)
  2021-03-12  4:34 ` [PR PATCH] [Updated] " endigma
@ 2021-03-12  4:36 ` endigma
  2021-03-12  4:37 ` [PR REVIEW] " endigma
                   ` (28 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 39309 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 01/12] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 02/12] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 03/12] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 04/12] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 05/12] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 06/12] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 07/12] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bd..555585e3f13 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 08/12] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 09/12] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:07:20 2021 -0400

    Fixed the symlink in /log/

commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:03:00 2021 -0400

    Update srcpkgs/docker-cli/template

    Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>

commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:12:04 2021 -0400

    Remove unneeded newlines

commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:10:30 2021 -0400

    "Trailing Whitespace"

commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:07:59 2021 -0400

    Removed 'unset CC'

commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:33 2021 -0400

    New package: docker-engine-20.10.5

commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:29 2021 -0400

    docker: update to 20.10.5.

commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:26 2021 -0400

    New package: docker-cli-20.10.5
---
 srcpkgs/docker-cli/template                   |  39 +++++
 srcpkgs/docker-cli/update                     |   1 +
 .../files/docker/log/run                      |   0
 .../files/docker/run                          |   0
 srcpkgs/docker-engine/template                |  60 ++++++++
 srcpkgs/docker-engine/update                  |   1 +
 srcpkgs/docker/template                       | 142 +-----------------
 srcpkgs/docker/update                         |   1 -
 8 files changed, 108 insertions(+), 136 deletions(-)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
 rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..555585e3f13
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..0a72a884f5e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 5f5973ed0090b362ca42f40c2007afd35f384291 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 21:03:36 -0400
Subject: [PATCH 10/12] Un-named distfiles in single-distfile template

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 555585e3f13..3967e2019b9 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,7 +12,7 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 

From ee7ea574f21df2012e43bd0d3411c4bec7daa6c9 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:34:17 -0400
Subject: [PATCH 11/12] Implemented suggestions from ahesford, along with a few
 changes.

---
 srcpkgs/docker-cli/template    | 19 ++++++-------------
 srcpkgs/docker-cli/update      |  2 +-
 srcpkgs/docker-engine/template | 20 +++++++-------------
 srcpkgs/docker-engine/update   |  2 +-
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 3967e2019b9..df84999e59b 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,13 +2,12 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-create_wrksrc=yes
 build_style=go
+wrksrc="cli-${version}"
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - cli"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
@@ -16,24 +15,18 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
-_cli_builddir="cli-$version"
-
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
-	export GITCOMMIT=$_cli_commit
+	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
-	mkdir -p "$wrksrc/_cli_builddir"
-
-	cd "$wrksrc/$_cli_builddir"
 	mkdir -p src/github.com/docker/
-	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	ln -sf "$wrksrc" src/github.com/docker/cli
 	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
 }
 
 do_install() {
-	vbin $_cli_builddir/build/docker
+	vbin build/docker
 }
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
index 47936e12584..2402ccb6eb5 100644
--- a/srcpkgs/docker-cli/update
+++ b/srcpkgs/docker-cli/update
@@ -1 +1 @@
-pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 0a72a884f5e..1c058305b03 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,39 +2,33 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - engine"
+depends="containerd iptables xz"
+short_desc="Engine for the Docker container daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
-
-distfiles="
-	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
 	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-
 checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
  9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
 
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
-_buildtags="seccomp"
 
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
-	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DOCKER_BUILDTAGS="seccomp"	#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 	mkdir -p "$wrksrc/$_moby_builddir"
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
index 6e08485891e..3ff71c71f1f 100644
--- a/srcpkgs/docker-engine/update
+++ b/srcpkgs/docker-engine/update
@@ -1 +1 @@
-pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From 734f0487b33a7e3550349d622a557403b6182d75 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:36:41 -0400
Subject: [PATCH 12/12] Implemented removal of GO111MODULE

---
 srcpkgs/docker-cli/template    | 2 --
 srcpkgs/docker-engine/template | 2 --
 2 files changed, 4 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index df84999e59b..b872f3337a6 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,8 +15,6 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 1c058305b03..c88489c8d0c 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -23,8 +23,6 @@ system_groups="docker"
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (66 preceding siblings ...)
  2021-03-12  4:36 ` endigma
@ 2021-03-12  4:37 ` endigma
  2021-03-12  4:43 ` [PR PATCH] [Updated] " endigma
                   ` (27 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592904635

Comment:
Implemented for `docker-cli` and `docker-engine`.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (67 preceding siblings ...)
  2021-03-12  4:37 ` [PR REVIEW] " endigma
@ 2021-03-12  4:43 ` endigma
  2021-03-12  4:43 ` [PR REVIEW] " endigma
                   ` (26 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 41051 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 01/13] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 02/13] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 03/13] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 04/13] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 05/13] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 06/13] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 07/13] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bd..555585e3f13 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 08/13] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 09/13] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:07:20 2021 -0400

    Fixed the symlink in /log/

commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:03:00 2021 -0400

    Update srcpkgs/docker-cli/template

    Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>

commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:12:04 2021 -0400

    Remove unneeded newlines

commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:10:30 2021 -0400

    "Trailing Whitespace"

commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:07:59 2021 -0400

    Removed 'unset CC'

commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:33 2021 -0400

    New package: docker-engine-20.10.5

commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:29 2021 -0400

    docker: update to 20.10.5.

commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:26 2021 -0400

    New package: docker-cli-20.10.5
---
 srcpkgs/docker-cli/template                   |  39 +++++
 srcpkgs/docker-cli/update                     |   1 +
 .../files/docker/log/run                      |   0
 .../files/docker/run                          |   0
 srcpkgs/docker-engine/template                |  60 ++++++++
 srcpkgs/docker-engine/update                  |   1 +
 srcpkgs/docker/template                       | 142 +-----------------
 srcpkgs/docker/update                         |   1 -
 8 files changed, 108 insertions(+), 136 deletions(-)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
 rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..555585e3f13
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..0a72a884f5e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 5f5973ed0090b362ca42f40c2007afd35f384291 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 21:03:36 -0400
Subject: [PATCH 10/13] Un-named distfiles in single-distfile template

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 555585e3f13..3967e2019b9 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,7 +12,7 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 

From ee7ea574f21df2012e43bd0d3411c4bec7daa6c9 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:34:17 -0400
Subject: [PATCH 11/13] Implemented suggestions from ahesford, along with a few
 changes.

---
 srcpkgs/docker-cli/template    | 19 ++++++-------------
 srcpkgs/docker-cli/update      |  2 +-
 srcpkgs/docker-engine/template | 20 +++++++-------------
 srcpkgs/docker-engine/update   |  2 +-
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 3967e2019b9..df84999e59b 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,13 +2,12 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-create_wrksrc=yes
 build_style=go
+wrksrc="cli-${version}"
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - cli"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
@@ -16,24 +15,18 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
-_cli_builddir="cli-$version"
-
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
-	export GITCOMMIT=$_cli_commit
+	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
-	mkdir -p "$wrksrc/_cli_builddir"
-
-	cd "$wrksrc/$_cli_builddir"
 	mkdir -p src/github.com/docker/
-	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	ln -sf "$wrksrc" src/github.com/docker/cli
 	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
 }
 
 do_install() {
-	vbin $_cli_builddir/build/docker
+	vbin build/docker
 }
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
index 47936e12584..2402ccb6eb5 100644
--- a/srcpkgs/docker-cli/update
+++ b/srcpkgs/docker-cli/update
@@ -1 +1 @@
-pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 0a72a884f5e..1c058305b03 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,39 +2,33 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - engine"
+depends="containerd iptables xz"
+short_desc="Engine for the Docker container daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
-
-distfiles="
-	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
 	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-
 checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
  9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
 
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
-_buildtags="seccomp"
 
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
-	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DOCKER_BUILDTAGS="seccomp"	#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 	mkdir -p "$wrksrc/$_moby_builddir"
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
index 6e08485891e..3ff71c71f1f 100644
--- a/srcpkgs/docker-engine/update
+++ b/srcpkgs/docker-engine/update
@@ -1 +1 @@
-pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From 734f0487b33a7e3550349d622a557403b6182d75 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:36:41 -0400
Subject: [PATCH 12/13] Implemented removal of GO111MODULE

---
 srcpkgs/docker-cli/template    | 2 --
 srcpkgs/docker-engine/template | 2 --
 2 files changed, 4 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index df84999e59b..b872f3337a6 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,8 +15,6 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 1c058305b03..c88489c8d0c 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -23,8 +23,6 @@ system_groups="docker"
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby

From 287cad2a67529e38ecf7eb558df10ef62602f36d Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:42:52 -0400
Subject: [PATCH 13/13] Implemented subpackaging of `docker`.

---
 srcpkgs/docker              |  1 +
 srcpkgs/docker-cli/template |  6 ++++++
 srcpkgs/docker/template     | 10 ----------
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/docker
 delete mode 100644 srcpkgs/docker/template

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 00000000000..e83f24b7abd
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli/
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b872f3337a6..2d4b2bb35b6 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,6 +15,12 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} docker-engine"
+}
+
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index 67aa113493f..00000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=20.10.5
-revision=1
-build_style=meta
-depends="docker-engine docker-cli"
-short_desc="Docker meta-package including the engine and cli tool"
-maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-license="Apache-2.0"
-homepage="http://docker.io/"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (68 preceding siblings ...)
  2021-03-12  4:43 ` [PR PATCH] [Updated] " endigma
@ 2021-03-12  4:43 ` endigma
  2021-03-12  4:48 ` endigma
                   ` (25 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592906486

Comment:
> The meta-package is appropriate, but it can still be added as a subpackage of `docker-cli` by putting the following function in your `docker-cli` template:
> 
> ```shell
> docker_package() {
> 	build_style="meta"
> 	short_desc="Docker container runtime"
> 	depends="${sourcepkg}>=${version}_${revision} moby"
> }
> ```
> 
> and make `srcpkgs/docker` a symbolic link to `docker-cli`.

Implemented.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (69 preceding siblings ...)
  2021-03-12  4:43 ` [PR REVIEW] " endigma
@ 2021-03-12  4:48 ` endigma
  2021-03-12  4:48 ` endigma
                   ` (24 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592907872

Comment:
I'll accept this reasoning, updated to `moby`. I'll likely be maintaining this package since I use this in production (yes I'm aware).

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (70 preceding siblings ...)
  2021-03-12  4:48 ` endigma
@ 2021-03-12  4:48 ` endigma
  2021-03-12  4:51 ` [PR PATCH] [Updated] " endigma
                   ` (23 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r592907872

Comment:
I'll accept this reasoning, updated to `moby`. I'll likely be maintaining this package since I use this in production (yes I'm aware), so I'll keep a watch on how the docker/engine moby/moby situation goes.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (71 preceding siblings ...)
  2021-03-12  4:48 ` endigma
@ 2021-03-12  4:51 ` endigma
  2021-03-16 15:51 ` endigma
                   ` (22 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-12  4:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 44421 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 01/15] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 02/15] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 03/15] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 04/15] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 05/15] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 06/15] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 07/15] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bd..555585e3f13 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 08/15] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 09/15] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:07:20 2021 -0400

    Fixed the symlink in /log/

commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:03:00 2021 -0400

    Update srcpkgs/docker-cli/template

    Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>

commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:12:04 2021 -0400

    Remove unneeded newlines

commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:10:30 2021 -0400

    "Trailing Whitespace"

commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:07:59 2021 -0400

    Removed 'unset CC'

commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:33 2021 -0400

    New package: docker-engine-20.10.5

commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:29 2021 -0400

    docker: update to 20.10.5.

commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:26 2021 -0400

    New package: docker-cli-20.10.5
---
 srcpkgs/docker-cli/template                   |  39 +++++
 srcpkgs/docker-cli/update                     |   1 +
 .../files/docker/log/run                      |   0
 .../files/docker/run                          |   0
 srcpkgs/docker-engine/template                |  60 ++++++++
 srcpkgs/docker-engine/update                  |   1 +
 srcpkgs/docker/template                       | 142 +-----------------
 srcpkgs/docker/update                         |   1 -
 8 files changed, 108 insertions(+), 136 deletions(-)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
 rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..555585e3f13
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..0a72a884f5e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 5f5973ed0090b362ca42f40c2007afd35f384291 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 21:03:36 -0400
Subject: [PATCH 10/15] Un-named distfiles in single-distfile template

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 555585e3f13..3967e2019b9 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,7 +12,7 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 

From ee7ea574f21df2012e43bd0d3411c4bec7daa6c9 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:34:17 -0400
Subject: [PATCH 11/15] Implemented suggestions from ahesford, along with a few
 changes.

---
 srcpkgs/docker-cli/template    | 19 ++++++-------------
 srcpkgs/docker-cli/update      |  2 +-
 srcpkgs/docker-engine/template | 20 +++++++-------------
 srcpkgs/docker-engine/update   |  2 +-
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 3967e2019b9..df84999e59b 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,13 +2,12 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-create_wrksrc=yes
 build_style=go
+wrksrc="cli-${version}"
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - cli"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
@@ -16,24 +15,18 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
-_cli_builddir="cli-$version"
-
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
-	export GITCOMMIT=$_cli_commit
+	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
-	mkdir -p "$wrksrc/_cli_builddir"
-
-	cd "$wrksrc/$_cli_builddir"
 	mkdir -p src/github.com/docker/
-	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	ln -sf "$wrksrc" src/github.com/docker/cli
 	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
 }
 
 do_install() {
-	vbin $_cli_builddir/build/docker
+	vbin build/docker
 }
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
index 47936e12584..2402ccb6eb5 100644
--- a/srcpkgs/docker-cli/update
+++ b/srcpkgs/docker-cli/update
@@ -1 +1 @@
-pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 0a72a884f5e..1c058305b03 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,39 +2,33 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - engine"
+depends="containerd iptables xz"
+short_desc="Engine for the Docker container daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
-
-distfiles="
-	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
 	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-
 checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
  9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
 
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
-_buildtags="seccomp"
 
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
-	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DOCKER_BUILDTAGS="seccomp"	#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 	mkdir -p "$wrksrc/$_moby_builddir"
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
index 6e08485891e..3ff71c71f1f 100644
--- a/srcpkgs/docker-engine/update
+++ b/srcpkgs/docker-engine/update
@@ -1 +1 @@
-pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From 734f0487b33a7e3550349d622a557403b6182d75 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:36:41 -0400
Subject: [PATCH 12/15] Implemented removal of GO111MODULE

---
 srcpkgs/docker-cli/template    | 2 --
 srcpkgs/docker-engine/template | 2 --
 2 files changed, 4 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index df84999e59b..b872f3337a6 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,8 +15,6 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 1c058305b03..c88489c8d0c 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -23,8 +23,6 @@ system_groups="docker"
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby

From 287cad2a67529e38ecf7eb558df10ef62602f36d Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:42:52 -0400
Subject: [PATCH 13/15] Implemented subpackaging of `docker`.

---
 srcpkgs/docker              |  1 +
 srcpkgs/docker-cli/template |  6 ++++++
 srcpkgs/docker/template     | 10 ----------
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/docker
 delete mode 100644 srcpkgs/docker/template

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 00000000000..e83f24b7abd
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli/
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b872f3337a6..2d4b2bb35b6 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,6 +15,12 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} docker-engine"
+}
+
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index 67aa113493f..00000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=20.10.5
-revision=1
-build_style=meta
-depends="docker-engine docker-cli"
-short_desc="Docker meta-package including the engine and cli tool"
-maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-license="Apache-2.0"
-homepage="http://docker.io/"

From dbcb2500c199a10411bced36d1c06f59a74ed4d6 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:50:59 -0400
Subject: [PATCH 14/15] Rename `docker-engine` to `moby`.

---
 srcpkgs/docker-cli/template                          | 4 ++--
 srcpkgs/{docker-engine => moby}/files/docker/log/run | 0
 srcpkgs/{docker-engine => moby}/files/docker/run     | 0
 srcpkgs/{docker-engine => moby}/template             | 4 ++--
 srcpkgs/{docker-engine => moby}/update               | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename srcpkgs/{docker-engine => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker-engine => moby}/files/docker/run (100%)
 rename srcpkgs/{docker-engine => moby}/template (97%)
 rename srcpkgs/{docker-engine => moby}/update (100%)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 2d4b2bb35b6..4e15ff8d39e 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,8 +2,8 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-build_style=go
 wrksrc="cli-${version}"
+build_style=go
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
 depends="git"
@@ -18,7 +18,7 @@ system_groups="docker"
 docker_package() {
 	build_style="meta"
 	short_desc="Docker container runtime"
-	depends="${sourcepkg}>=${version}_${revision} docker-engine"
+	depends="${sourcepkg}>=${version}_${revision} moby"
 }
 
 do_build() {
diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker-engine/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/moby/files/docker/run
similarity index 100%
rename from srcpkgs/docker-engine/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/moby/template
similarity index 97%
rename from srcpkgs/docker-engine/template
rename to srcpkgs/moby/template
index c88489c8d0c..8fc94d5ab17 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/moby/template
@@ -1,5 +1,5 @@
-# Template file for 'docker-engine'
-pkgname=docker-engine
+# Template file for 'moby'
+pkgname=moby
 version=20.10.5
 revision=1
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/moby/update
similarity index 100%
rename from srcpkgs/docker-engine/update
rename to srcpkgs/moby/update

From ec19f96348901e40fdc93032025fce405b262fcf Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:51:16 -0400
Subject: [PATCH 15/15] Updated moby description

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 8fc94d5ab17..3ca49d55347 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -10,7 +10,7 @@ go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd iptables xz"
-short_desc="Engine for the Docker container daemon"
+short_desc="Container engine for the Docker ecosystem"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (72 preceding siblings ...)
  2021-03-12  4:51 ` [PR PATCH] [Updated] " endigma
@ 2021-03-16 15:51 ` endigma
  2021-03-16 15:55 ` endigma
                   ` (21 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-16 15:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 44493 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 01/15] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..99a42a47fb9d
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..47936e125846
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 02/15] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f8..000000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33e..642bc1ecd711 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 03/15] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 000000000000..ed42f5fa72f8
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 000000000000..59d25887222e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 000000000000..6e08485891e3
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 04/15] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9d..b66e6a4c9664 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222e..b4d1d4c4274d 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 05/15] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274d..4698027dbdc6 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 06/15] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c9664..444c51925bda 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc6..0a72a884f5ee 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd711..67aa113493fb 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 07/15] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bda..555585e3f134 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 08/15] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 09/15] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:07:20 2021 -0400

    Fixed the symlink in /log/

commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:03:00 2021 -0400

    Update srcpkgs/docker-cli/template

    Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>

commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:12:04 2021 -0400

    Remove unneeded newlines

commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:10:30 2021 -0400

    "Trailing Whitespace"

commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:07:59 2021 -0400

    Removed 'unset CC'

commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:33 2021 -0400

    New package: docker-engine-20.10.5

commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:29 2021 -0400

    docker: update to 20.10.5.

commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:26 2021 -0400

    New package: docker-cli-20.10.5
---
 srcpkgs/docker-cli/template                   |  39 +++++
 srcpkgs/docker-cli/update                     |   1 +
 .../files/docker/log/run                      |   0
 .../files/docker/run                          |   0
 srcpkgs/docker-engine/template                |  60 ++++++++
 srcpkgs/docker-engine/update                  |   1 +
 srcpkgs/docker/template                       | 142 +-----------------
 srcpkgs/docker/update                         |   1 -
 8 files changed, 108 insertions(+), 136 deletions(-)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
 rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..555585e3f134
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..47936e125846
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 000000000000..0a72a884f5ee
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 000000000000..6e08485891e3
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33e..67aa113493fb 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 5f5973ed0090b362ca42f40c2007afd35f384291 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 21:03:36 -0400
Subject: [PATCH 10/15] Un-named distfiles in single-distfile template

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 555585e3f134..3967e2019b93 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,7 +12,7 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 

From ee7ea574f21df2012e43bd0d3411c4bec7daa6c9 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:34:17 -0400
Subject: [PATCH 11/15] Implemented suggestions from ahesford, along with a few
 changes.

---
 srcpkgs/docker-cli/template    | 19 ++++++-------------
 srcpkgs/docker-cli/update      |  2 +-
 srcpkgs/docker-engine/template | 20 +++++++-------------
 srcpkgs/docker-engine/update   |  2 +-
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 3967e2019b93..df84999e59b0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,13 +2,12 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-create_wrksrc=yes
 build_style=go
+wrksrc="cli-${version}"
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - cli"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
@@ -16,24 +15,18 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
-_cli_builddir="cli-$version"
-
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
-	export GITCOMMIT=$_cli_commit
+	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
-	mkdir -p "$wrksrc/_cli_builddir"
-
-	cd "$wrksrc/$_cli_builddir"
 	mkdir -p src/github.com/docker/
-	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	ln -sf "$wrksrc" src/github.com/docker/cli
 	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
 }
 
 do_install() {
-	vbin $_cli_builddir/build/docker
+	vbin build/docker
 }
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
index 47936e125846..2402ccb6eb59 100644
--- a/srcpkgs/docker-cli/update
+++ b/srcpkgs/docker-cli/update
@@ -1 +1 @@
-pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 0a72a884f5ee..1c058305b031 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,39 +2,33 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - engine"
+depends="containerd iptables xz"
+short_desc="Engine for the Docker container daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
-
-distfiles="
-	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
 	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-
 checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
  9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
 
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
-_buildtags="seccomp"
 
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
-	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DOCKER_BUILDTAGS="seccomp"	#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 	mkdir -p "$wrksrc/$_moby_builddir"
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
index 6e08485891e3..3ff71c71f1f2 100644
--- a/srcpkgs/docker-engine/update
+++ b/srcpkgs/docker-engine/update
@@ -1 +1 @@
-pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From 734f0487b33a7e3550349d622a557403b6182d75 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:36:41 -0400
Subject: [PATCH 12/15] Implemented removal of GO111MODULE

---
 srcpkgs/docker-cli/template    | 2 --
 srcpkgs/docker-engine/template | 2 --
 2 files changed, 4 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index df84999e59b0..b872f3337a62 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,8 +15,6 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 1c058305b031..c88489c8d0cf 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -23,8 +23,6 @@ system_groups="docker"
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby

From 287cad2a67529e38ecf7eb558df10ef62602f36d Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:42:52 -0400
Subject: [PATCH 13/15] Implemented subpackaging of `docker`.

---
 srcpkgs/docker              |  1 +
 srcpkgs/docker-cli/template |  6 ++++++
 srcpkgs/docker/template     | 10 ----------
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/docker
 delete mode 100644 srcpkgs/docker/template

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..e83f24b7abdf
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli/
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b872f3337a62..2d4b2bb35b6c 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,6 +15,12 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} docker-engine"
+}
+
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index 67aa113493fb..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=20.10.5
-revision=1
-build_style=meta
-depends="docker-engine docker-cli"
-short_desc="Docker meta-package including the engine and cli tool"
-maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-license="Apache-2.0"
-homepage="http://docker.io/"

From dbcb2500c199a10411bced36d1c06f59a74ed4d6 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:50:59 -0400
Subject: [PATCH 14/15] Rename `docker-engine` to `moby`.

---
 srcpkgs/docker-cli/template                          | 4 ++--
 srcpkgs/{docker-engine => moby}/files/docker/log/run | 0
 srcpkgs/{docker-engine => moby}/files/docker/run     | 0
 srcpkgs/{docker-engine => moby}/template             | 4 ++--
 srcpkgs/{docker-engine => moby}/update               | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename srcpkgs/{docker-engine => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker-engine => moby}/files/docker/run (100%)
 rename srcpkgs/{docker-engine => moby}/template (97%)
 rename srcpkgs/{docker-engine => moby}/update (100%)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 2d4b2bb35b6c..4e15ff8d39e3 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,8 +2,8 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-build_style=go
 wrksrc="cli-${version}"
+build_style=go
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
 depends="git"
@@ -18,7 +18,7 @@ system_groups="docker"
 docker_package() {
 	build_style="meta"
 	short_desc="Docker container runtime"
-	depends="${sourcepkg}>=${version}_${revision} docker-engine"
+	depends="${sourcepkg}>=${version}_${revision} moby"
 }
 
 do_build() {
diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker-engine/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/moby/files/docker/run
similarity index 100%
rename from srcpkgs/docker-engine/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/moby/template
similarity index 97%
rename from srcpkgs/docker-engine/template
rename to srcpkgs/moby/template
index c88489c8d0cf..8fc94d5ab172 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/moby/template
@@ -1,5 +1,5 @@
-# Template file for 'docker-engine'
-pkgname=docker-engine
+# Template file for 'moby'
+pkgname=moby
 version=20.10.5
 revision=1
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/moby/update
similarity index 100%
rename from srcpkgs/docker-engine/update
rename to srcpkgs/moby/update

From ec19f96348901e40fdc93032025fce405b262fcf Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:51:16 -0400
Subject: [PATCH 15/15] Updated moby description

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 8fc94d5ab172..3ca49d553476 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -10,7 +10,7 @@ go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd iptables xz"
-short_desc="Engine for the Docker container daemon"
+short_desc="Container engine for the Docker ecosystem"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (73 preceding siblings ...)
  2021-03-16 15:51 ` endigma
@ 2021-03-16 15:55 ` endigma
  2021-03-16 17:24 ` [PR PATCH] [Updated] " rainyuu
                   ` (20 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-16 15:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-800385136

Comment:
Just merged upstream, ensuring everything builds properly now.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (74 preceding siblings ...)
  2021-03-16 15:55 ` endigma
@ 2021-03-16 17:24 ` rainyuu
  2021-03-16 17:26 ` [PR REVIEW] " endigma
                   ` (19 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: rainyuu @ 2021-03-16 17:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by rainyuu against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 47379 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 01/17] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..99a42a47fb9d
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..47936e125846
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 02/17] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f8..000000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33e..642bc1ecd711 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 03/17] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 000000000000..ed42f5fa72f8
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 000000000000..59d25887222e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 000000000000..6e08485891e3
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 04/17] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9d..b66e6a4c9664 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222e..b4d1d4c4274d 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 05/17] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274d..4698027dbdc6 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 06/17] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c9664..444c51925bda 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc6..0a72a884f5ee 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd711..67aa113493fb 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 07/17] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bda..555585e3f134 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 08/17] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 09/17] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:07:20 2021 -0400

    Fixed the symlink in /log/

commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:03:00 2021 -0400

    Update srcpkgs/docker-cli/template

    Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>

commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:12:04 2021 -0400

    Remove unneeded newlines

commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:10:30 2021 -0400

    "Trailing Whitespace"

commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:07:59 2021 -0400

    Removed 'unset CC'

commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:33 2021 -0400

    New package: docker-engine-20.10.5

commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:29 2021 -0400

    docker: update to 20.10.5.

commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:26 2021 -0400

    New package: docker-cli-20.10.5
---
 srcpkgs/docker-cli/template                   |  39 +++++
 srcpkgs/docker-cli/update                     |   1 +
 .../files/docker/log/run                      |   0
 .../files/docker/run                          |   0
 srcpkgs/docker-engine/template                |  60 ++++++++
 srcpkgs/docker-engine/update                  |   1 +
 srcpkgs/docker/template                       | 142 +-----------------
 srcpkgs/docker/update                         |   1 -
 8 files changed, 108 insertions(+), 136 deletions(-)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
 rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..555585e3f134
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..47936e125846
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 000000000000..0a72a884f5ee
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 000000000000..6e08485891e3
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33e..67aa113493fb 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 5f5973ed0090b362ca42f40c2007afd35f384291 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 21:03:36 -0400
Subject: [PATCH 10/17] Un-named distfiles in single-distfile template

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 555585e3f134..3967e2019b93 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,7 +12,7 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 

From ee7ea574f21df2012e43bd0d3411c4bec7daa6c9 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:34:17 -0400
Subject: [PATCH 11/17] Implemented suggestions from ahesford, along with a few
 changes.

---
 srcpkgs/docker-cli/template    | 19 ++++++-------------
 srcpkgs/docker-cli/update      |  2 +-
 srcpkgs/docker-engine/template | 20 +++++++-------------
 srcpkgs/docker-engine/update   |  2 +-
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 3967e2019b93..df84999e59b0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,13 +2,12 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-create_wrksrc=yes
 build_style=go
+wrksrc="cli-${version}"
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - cli"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
@@ -16,24 +15,18 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
-_cli_builddir="cli-$version"
-
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
-	export GITCOMMIT=$_cli_commit
+	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
-	mkdir -p "$wrksrc/_cli_builddir"
-
-	cd "$wrksrc/$_cli_builddir"
 	mkdir -p src/github.com/docker/
-	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	ln -sf "$wrksrc" src/github.com/docker/cli
 	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
 }
 
 do_install() {
-	vbin $_cli_builddir/build/docker
+	vbin build/docker
 }
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
index 47936e125846..2402ccb6eb59 100644
--- a/srcpkgs/docker-cli/update
+++ b/srcpkgs/docker-cli/update
@@ -1 +1 @@
-pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 0a72a884f5ee..1c058305b031 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,39 +2,33 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - engine"
+depends="containerd iptables xz"
+short_desc="Engine for the Docker container daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
-
-distfiles="
-	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
 	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-
 checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
  9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
 
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
-_buildtags="seccomp"
 
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
-	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DOCKER_BUILDTAGS="seccomp"	#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 	mkdir -p "$wrksrc/$_moby_builddir"
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
index 6e08485891e3..3ff71c71f1f2 100644
--- a/srcpkgs/docker-engine/update
+++ b/srcpkgs/docker-engine/update
@@ -1 +1 @@
-pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From 734f0487b33a7e3550349d622a557403b6182d75 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:36:41 -0400
Subject: [PATCH 12/17] Implemented removal of GO111MODULE

---
 srcpkgs/docker-cli/template    | 2 --
 srcpkgs/docker-engine/template | 2 --
 2 files changed, 4 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index df84999e59b0..b872f3337a62 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,8 +15,6 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 1c058305b031..c88489c8d0cf 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -23,8 +23,6 @@ system_groups="docker"
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby

From 287cad2a67529e38ecf7eb558df10ef62602f36d Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:42:52 -0400
Subject: [PATCH 13/17] Implemented subpackaging of `docker`.

---
 srcpkgs/docker              |  1 +
 srcpkgs/docker-cli/template |  6 ++++++
 srcpkgs/docker/template     | 10 ----------
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/docker
 delete mode 100644 srcpkgs/docker/template

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..e83f24b7abdf
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli/
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b872f3337a62..2d4b2bb35b6c 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,6 +15,12 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} docker-engine"
+}
+
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index 67aa113493fb..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=20.10.5
-revision=1
-build_style=meta
-depends="docker-engine docker-cli"
-short_desc="Docker meta-package including the engine and cli tool"
-maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-license="Apache-2.0"
-homepage="http://docker.io/"

From dbcb2500c199a10411bced36d1c06f59a74ed4d6 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:50:59 -0400
Subject: [PATCH 14/17] Rename `docker-engine` to `moby`.

---
 srcpkgs/docker-cli/template                          | 4 ++--
 srcpkgs/{docker-engine => moby}/files/docker/log/run | 0
 srcpkgs/{docker-engine => moby}/files/docker/run     | 0
 srcpkgs/{docker-engine => moby}/template             | 4 ++--
 srcpkgs/{docker-engine => moby}/update               | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename srcpkgs/{docker-engine => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker-engine => moby}/files/docker/run (100%)
 rename srcpkgs/{docker-engine => moby}/template (97%)
 rename srcpkgs/{docker-engine => moby}/update (100%)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 2d4b2bb35b6c..4e15ff8d39e3 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,8 +2,8 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-build_style=go
 wrksrc="cli-${version}"
+build_style=go
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
 depends="git"
@@ -18,7 +18,7 @@ system_groups="docker"
 docker_package() {
 	build_style="meta"
 	short_desc="Docker container runtime"
-	depends="${sourcepkg}>=${version}_${revision} docker-engine"
+	depends="${sourcepkg}>=${version}_${revision} moby"
 }
 
 do_build() {
diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker-engine/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/moby/files/docker/run
similarity index 100%
rename from srcpkgs/docker-engine/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/moby/template
similarity index 97%
rename from srcpkgs/docker-engine/template
rename to srcpkgs/moby/template
index c88489c8d0cf..8fc94d5ab172 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/moby/template
@@ -1,5 +1,5 @@
-# Template file for 'docker-engine'
-pkgname=docker-engine
+# Template file for 'moby'
+pkgname=moby
 version=20.10.5
 revision=1
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/moby/update
similarity index 100%
rename from srcpkgs/docker-engine/update
rename to srcpkgs/moby/update

From ec19f96348901e40fdc93032025fce405b262fcf Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:51:16 -0400
Subject: [PATCH 15/17] Updated moby description

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 8fc94d5ab172..3ca49d553476 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -10,7 +10,7 @@ go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd iptables xz"
-short_desc="Engine for the Docker container daemon"
+short_desc="Container engine for the Docker ecosystem"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"

From 27f7adec8af0bf9c270eae7cac85f8ec69a2418e Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 19:21:51 +0100
Subject: [PATCH 16/17] docker-cli: use default go template for building

---
 srcpkgs/docker-cli/template | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 4e15ff8d39e3..747f2c67ca81 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -4,8 +4,12 @@ version=20.10.5
 revision=1
 wrksrc="cli-${version}"
 build_style=go
+go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"
-hostmakedepends="pkg-config tar"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
 depends="git"
 short_desc="Command-line interface for the Docker daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
@@ -15,22 +19,12 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
 docker_package() {
 	build_style="meta"
 	short_desc="Docker container runtime"
 	depends="${sourcepkg}>=${version}_${revision} moby"
 }
-
-do_build() {
-	export AUTO_GOPATH=1
-	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-
-	mkdir -p src/github.com/docker/
-	ln -sf "$wrksrc" src/github.com/docker/cli
-	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
-}
-
-do_install() {
-	vbin build/docker
-}

From b76dce796a0854e2b410c8f132ad8edb659c926a Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 19:22:07 +0100
Subject: [PATCH 17/17] moby: remove git commit hash, use tag name instead

---
 srcpkgs/moby/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 3ca49d553476..da57c97c0753 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,6 @@
 pkgname=moby
 version=20.10.5
 revision=1
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
 _libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
@@ -25,8 +24,8 @@ _libnetwork_builddir="libnetwork-$_libnetwork_commit"
 
 do_build() {
 	export AUTO_GOPATH=1
-	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
-	export DOCKER_BUILDTAGS="seccomp"	#
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 	mkdir -p "$wrksrc/$_moby_builddir"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (75 preceding siblings ...)
  2021-03-16 17:24 ` [PR PATCH] [Updated] " rainyuu
@ 2021-03-16 17:26 ` endigma
  2021-03-16 17:26 ` endigma
                   ` (18 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-16 17:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r595388762

Comment:
This is resolved with the latest commits.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (76 preceding siblings ...)
  2021-03-16 17:26 ` [PR REVIEW] " endigma
@ 2021-03-16 17:26 ` endigma
  2021-03-16 17:40 ` [PR PATCH] [Updated] " rainyuu
                   ` (17 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-16 17:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New review comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r595388841

Comment:
Resolved

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (77 preceding siblings ...)
  2021-03-16 17:26 ` endigma
@ 2021-03-16 17:40 ` rainyuu
  2021-03-16 18:41 ` rainyuu
                   ` (16 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: rainyuu @ 2021-03-16 17:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by rainyuu against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 48801 bytes --]

From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 01/18] New package: docker-cli-20.10.5

---
 srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
 srcpkgs/docker-cli/update   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..99a42a47fb9d
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..47936e125846
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'

From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 02/18] docker: update to 20.10.5.

---
 srcpkgs/docker/files/docker/log/run |   1 -
 srcpkgs/docker/files/docker/run     |   8 --
 srcpkgs/docker/template             | 138 ++--------------------------
 srcpkgs/docker/update               |   1 -
 4 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 120000 srcpkgs/docker/files/docker/log/run
 delete mode 100755 srcpkgs/docker/files/docker/run
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f8..000000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
-    mkdir -p /sys/fs/cgroup/systemd;
-    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33e..642bc1ecd711 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
 
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
+build_style=meta
 
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
+depends="docker-engine docker-cli"
 
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 03/18] New package: docker-engine-20.10.5

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
 srcpkgs/docker-engine/files/docker/run     |   8 +++
 srcpkgs/docker-engine/template             |  67 +++++++++++++++++++++
 srcpkgs/docker-engine/update               |   1 +
 4 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/docker-engine/files/docker/log/run
 create mode 100644 srcpkgs/docker-engine/files/docker/run
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

literal 0
HcmV?d00001

diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 000000000000..ed42f5fa72f8
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+    mkdir -p /sys/fs/cgroup/systemd;
+    mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 000000000000..59d25887222e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	unset CC
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 000000000000..6e08485891e3
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'

From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 04/18] Removed 'unset CC'

---
 srcpkgs/docker-cli/template    | 1 -
 srcpkgs/docker-engine/template | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9d..b66e6a4c9664 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=$_cli_commit
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
 
 	mkdir -p "$wrksrc/_cli_builddir"
 
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222e..b4d1d4c4274d 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	unset CC
-
+	
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 05/18] "Trailing Whitespace"

---
 srcpkgs/docker-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274d..4698027dbdc6 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
 	export DOCKER_BUILDTAGS=$_buildtags		#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	
+
 	mkdir -p "$wrksrc/$_moby_builddir"
 	mkdir -p "$wrksrc/$_libnetwork_builddir"
 

From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 06/18] Remove unneeded newlines

---
 srcpkgs/docker-cli/template    | 6 ------
 srcpkgs/docker-engine/template | 6 ------
 srcpkgs/docker/template        | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c9664..444c51925bda 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/cli"
-
 hostmakedepends="pkg-config tar"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc6..0a72a884f5ee 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-
 archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd runc iptables xz git"
-
 short_desc="Pack, ship and run any application as a lightweight container - engine"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://www.docker.io"
-
 system_groups="docker"
 
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd711..67aa113493fb 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
 pkgname=docker
 version=20.10.5
 revision=1
-
 build_style=meta
-
 depends="docker-engine docker-cli"
-
 short_desc="Docker meta-package including the engine and cli tool"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
 license="Apache-2.0"
 homepage="http://docker.io/"

From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 07/18] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/docker-cli/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bda..555585e3f134 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
 
 _cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
 _cli_builddir="cli-$version"

From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 08/18] Fixed the symlink in /log/

---
 srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20

diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file

From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 09/18] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:07:20 2021 -0400

    Fixed the symlink in /log/

commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date:   Thu Mar 11 20:03:00 2021 -0400

    Update srcpkgs/docker-cli/template

    Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>

commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:12:04 2021 -0400

    Remove unneeded newlines

commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:10:30 2021 -0400

    "Trailing Whitespace"

commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 15:07:59 2021 -0400

    Removed 'unset CC'

commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:33 2021 -0400

    New package: docker-engine-20.10.5

commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:29 2021 -0400

    docker: update to 20.10.5.

commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date:   Mon Mar 8 14:29:26 2021 -0400

    New package: docker-cli-20.10.5
---
 srcpkgs/docker-cli/template                   |  39 +++++
 srcpkgs/docker-cli/update                     |   1 +
 .../files/docker/log/run                      |   0
 .../files/docker/run                          |   0
 srcpkgs/docker-engine/template                |  60 ++++++++
 srcpkgs/docker-engine/update                  |   1 +
 srcpkgs/docker/template                       | 142 +-----------------
 srcpkgs/docker/update                         |   1 -
 8 files changed, 108 insertions(+), 136 deletions(-)
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
 rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/docker-engine/template
 create mode 100644 srcpkgs/docker-engine/update
 delete mode 100644 srcpkgs/docker/update

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..555585e3f134
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export GITCOMMIT=$_cli_commit
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/_cli_builddir"
+
+	cd "$wrksrc/$_cli_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+	vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..47936e125846
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 000000000000..0a72a884f5ee
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+distfiles="
+	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
+	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 000000000000..6e08485891e3
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33e..67aa113493fb 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.15
+version=20.10.5
 revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'

From 5f5973ed0090b362ca42f40c2007afd35f384291 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 21:03:36 -0400
Subject: [PATCH 10/18] Un-named distfiles in single-distfile template

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 555585e3f134..3967e2019b93 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,7 +12,7 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 

From ee7ea574f21df2012e43bd0d3411c4bec7daa6c9 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:34:17 -0400
Subject: [PATCH 11/18] Implemented suggestions from ahesford, along with a few
 changes.

---
 srcpkgs/docker-cli/template    | 19 ++++++-------------
 srcpkgs/docker-cli/update      |  2 +-
 srcpkgs/docker-engine/template | 20 +++++++-------------
 srcpkgs/docker-engine/update   |  2 +-
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 3967e2019b93..df84999e59b0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,13 +2,12 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-create_wrksrc=yes
 build_style=go
+wrksrc="cli-${version}"
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - cli"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
@@ -16,24 +15,18 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
-_cli_builddir="cli-$version"
-
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
-	export GITCOMMIT=$_cli_commit
+	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
-	mkdir -p "$wrksrc/_cli_builddir"
-
-	cd "$wrksrc/$_cli_builddir"
 	mkdir -p src/github.com/docker/
-	ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+	ln -sf "$wrksrc" src/github.com/docker/cli
 	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
 }
 
 do_install() {
-	vbin $_cli_builddir/build/docker
+	vbin build/docker
 }
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
index 47936e125846..2402ccb6eb59 100644
--- a/srcpkgs/docker-cli/update
+++ b/srcpkgs/docker-cli/update
@@ -1 +1 @@
-pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 0a72a884f5ee..1c058305b031 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,39 +2,33 @@
 pkgname=docker-engine
 version=20.10.5
 revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - engine"
+depends="containerd iptables xz"
+short_desc="Engine for the Docker container daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
-system_groups="docker"
-
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc	# https://github.com/moby/moby/commits/v$version
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
-
-distfiles="
-	https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
 	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-
 checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
  9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
 
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
-_buildtags="seccomp"
 
 export GO111MODULE=off # go1.16 defaults to on
 
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
-	export DOCKER_BUILDTAGS=$_buildtags		#
+	export DOCKER_BUILDTAGS="seccomp"	#
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 	mkdir -p "$wrksrc/$_moby_builddir"
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
index 6e08485891e3..3ff71c71f1f2 100644
--- a/srcpkgs/docker-engine/update
+++ b/srcpkgs/docker-engine/update
@@ -1 +1 @@
-pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From 734f0487b33a7e3550349d622a557403b6182d75 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:36:41 -0400
Subject: [PATCH 12/18] Implemented removal of GO111MODULE

---
 srcpkgs/docker-cli/template    | 2 --
 srcpkgs/docker-engine/template | 2 --
 2 files changed, 4 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index df84999e59b0..b872f3337a62 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,8 +15,6 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 1c058305b031..c88489c8d0cf 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -23,8 +23,6 @@ system_groups="docker"
 _moby_builddir="moby-$version"
 _libnetwork_builddir="libnetwork-$_libnetwork_commit"
 
-export GO111MODULE=off # go1.16 defaults to on
-
 do_build() {
 	export AUTO_GOPATH=1
 	export DOCKER_GITCOMMIT=$_moby_commit	# for moby

From 287cad2a67529e38ecf7eb558df10ef62602f36d Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:42:52 -0400
Subject: [PATCH 13/18] Implemented subpackaging of `docker`.

---
 srcpkgs/docker              |  1 +
 srcpkgs/docker-cli/template |  6 ++++++
 srcpkgs/docker/template     | 10 ----------
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/docker
 delete mode 100644 srcpkgs/docker/template

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..e83f24b7abdf
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli/
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b872f3337a62..2d4b2bb35b6c 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -15,6 +15,12 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} docker-engine"
+}
+
 do_build() {
 	export AUTO_GOPATH=1
 	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index 67aa113493fb..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=20.10.5
-revision=1
-build_style=meta
-depends="docker-engine docker-cli"
-short_desc="Docker meta-package including the engine and cli tool"
-maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-license="Apache-2.0"
-homepage="http://docker.io/"

From dbcb2500c199a10411bced36d1c06f59a74ed4d6 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:50:59 -0400
Subject: [PATCH 14/18] Rename `docker-engine` to `moby`.

---
 srcpkgs/docker-cli/template                          | 4 ++--
 srcpkgs/{docker-engine => moby}/files/docker/log/run | 0
 srcpkgs/{docker-engine => moby}/files/docker/run     | 0
 srcpkgs/{docker-engine => moby}/template             | 4 ++--
 srcpkgs/{docker-engine => moby}/update               | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename srcpkgs/{docker-engine => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker-engine => moby}/files/docker/run (100%)
 rename srcpkgs/{docker-engine => moby}/template (97%)
 rename srcpkgs/{docker-engine => moby}/update (100%)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 2d4b2bb35b6c..4e15ff8d39e3 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,8 +2,8 @@
 pkgname=docker-cli
 version=20.10.5
 revision=1
-build_style=go
 wrksrc="cli-${version}"
+build_style=go
 go_import_path="github.com/docker/cli"
 hostmakedepends="pkg-config tar"
 depends="git"
@@ -18,7 +18,7 @@ system_groups="docker"
 docker_package() {
 	build_style="meta"
 	short_desc="Docker container runtime"
-	depends="${sourcepkg}>=${version}_${revision} docker-engine"
+	depends="${sourcepkg}>=${version}_${revision} moby"
 }
 
 do_build() {
diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker-engine/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/moby/files/docker/run
similarity index 100%
rename from srcpkgs/docker-engine/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/moby/template
similarity index 97%
rename from srcpkgs/docker-engine/template
rename to srcpkgs/moby/template
index c88489c8d0cf..8fc94d5ab172 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/moby/template
@@ -1,5 +1,5 @@
-# Template file for 'docker-engine'
-pkgname=docker-engine
+# Template file for 'moby'
+pkgname=moby
 version=20.10.5
 revision=1
 _moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/moby/update
similarity index 100%
rename from srcpkgs/docker-engine/update
rename to srcpkgs/moby/update

From ec19f96348901e40fdc93032025fce405b262fcf Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:51:16 -0400
Subject: [PATCH 15/18] Updated moby description

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 8fc94d5ab172..3ca49d553476 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -10,7 +10,7 @@ go_import_path="github.com/docker/docker"
 hostmakedepends="pkg-config tar"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd iptables xz"
-short_desc="Engine for the Docker container daemon"
+short_desc="Container engine for the Docker ecosystem"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"

From 27f7adec8af0bf9c270eae7cac85f8ec69a2418e Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 19:21:51 +0100
Subject: [PATCH 16/18] docker-cli: use default go template for building

---
 srcpkgs/docker-cli/template | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 4e15ff8d39e3..747f2c67ca81 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -4,8 +4,12 @@ version=20.10.5
 revision=1
 wrksrc="cli-${version}"
 build_style=go
+go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"
-hostmakedepends="pkg-config tar"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
 depends="git"
 short_desc="Command-line interface for the Docker daemon"
 maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
@@ -15,22 +19,12 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
 checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
 system_groups="docker"
 
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
 docker_package() {
 	build_style="meta"
 	short_desc="Docker container runtime"
 	depends="${sourcepkg}>=${version}_${revision} moby"
 }
-
-do_build() {
-	export AUTO_GOPATH=1
-	export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-
-	mkdir -p src/github.com/docker/
-	ln -sf "$wrksrc" src/github.com/docker/cli
-	GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
-}
-
-do_install() {
-	vbin build/docker
-}

From b76dce796a0854e2b410c8f132ad8edb659c926a Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 19:22:07 +0100
Subject: [PATCH 17/18] moby: remove git commit hash, use tag name instead

---
 srcpkgs/moby/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 3ca49d553476..da57c97c0753 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,6 @@
 pkgname=moby
 version=20.10.5
 revision=1
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
 _libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
@@ -25,8 +24,8 @@ _libnetwork_builddir="libnetwork-$_libnetwork_commit"
 
 do_build() {
 	export AUTO_GOPATH=1
-	export DOCKER_GITCOMMIT=$_moby_commit	# for moby
-	export DOCKER_BUILDTAGS="seccomp"	#
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
 	export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 	mkdir -p "$wrksrc/$_moby_builddir"

From 614a756b856494b5ce55b92afec3a471c9936e65 Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 19:39:07 +0100
Subject: [PATCH 18/18] moby: clean up template

---
 srcpkgs/moby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index da57c97c0753..6d8ef4e83729 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -6,7 +6,7 @@ _libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
-hostmakedepends="pkg-config tar"
+hostmakedepends="pkg-config"
 makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
 depends="containerd iptables xz"
 short_desc="Container engine for the Docker ecosystem"
@@ -14,7 +14,7 @@ maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
 distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
-	https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+ https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
 checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
  9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
 system_groups="docker"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (78 preceding siblings ...)
  2021-03-16 17:40 ` [PR PATCH] [Updated] " rainyuu
@ 2021-03-16 18:41 ` rainyuu
  2021-03-20 14:42 ` endigma
                   ` (15 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: rainyuu @ 2021-03-16 18:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by rainyuu against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 10852 bytes --]

From cd8d424157622da2e50452ae56d7de12877fb8e1 Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 20:37:57 +0100
Subject: [PATCH] docker: split package, update to 20.10.5

New package: docker-cli-20.10.5
New package: moby-20.10.5
---
 srcpkgs/docker                                |   1 +
 srcpkgs/docker-cli/template                   |  30 ++++
 srcpkgs/docker-cli/update                     |   1 +
 srcpkgs/docker/template                       | 138 ------------------
 srcpkgs/docker/update                         |   1 -
 srcpkgs/{docker => moby}/files/docker/log/run |   0
 srcpkgs/{docker => moby}/files/docker/run     |   0
 srcpkgs/moby/template                         |  51 +++++++
 srcpkgs/moby/update                           |   1 +
 9 files changed, 84 insertions(+), 139 deletions(-)
 create mode 120000 srcpkgs/docker
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 delete mode 100644 srcpkgs/docker/template
 delete mode 100644 srcpkgs/docker/update
 rename srcpkgs/{docker => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker => moby}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/moby/template
 create mode 100644 srcpkgs/moby/update

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..1f54c86ca232
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..747f2c67ca81
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,30 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+wrksrc="cli-${version}"
+build_style=go
+go_package="github.com/docker/cli/cmd/docker"
+go_import_path="github.com/docker/cli"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} moby"
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..2402ccb6eb59
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index e0830515a33e..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,138 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=19.03.15
-revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/moby/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
new file mode 100644
index 000000000000..6d8ef4e83729
--- /dev/null
+++ b/srcpkgs/moby/template
@@ -0,0 +1,51 @@
+# Template file for 'moby'
+pkgname=moby
+version=20.10.5
+revision=1
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd iptables xz"
+short_desc="Container engine for the Docker ecosystem"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+ https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/moby/update b/srcpkgs/moby/update
new file mode 100644
index 000000000000..3ff71c71f1f2
--- /dev/null
+++ b/srcpkgs/moby/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (79 preceding siblings ...)
  2021-03-16 18:41 ` rainyuu
@ 2021-03-20 14:42 ` endigma
  2021-03-20 15:25 ` dm17
                   ` (14 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-20 14:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-803366528

Comment:
So does something else need to happen for this to be merged?

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (80 preceding siblings ...)
  2021-03-20 14:42 ` endigma
@ 2021-03-20 15:25 ` dm17
  2021-03-20 15:40 ` ahesford
                   ` (13 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: dm17 @ 2021-03-20 15:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

New comment by dm17 on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-803378756

Comment:
Possible to bump docker version? I have 19.03 on Void dev workstation, and there are some issues I'm having trouble tracking down - which don't occur on 20.10 ( that I'm running in staging & production).

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (81 preceding siblings ...)
  2021-03-20 15:25 ` dm17
@ 2021-03-20 15:40 ` ahesford
  2021-03-20 16:04 ` endigma
                   ` (12 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-03-20 15:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-803382645

Comment:
@ericonr @sgn Do either of you have any remaining issues with this restructuring?

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (82 preceding siblings ...)
  2021-03-20 15:40 ` ahesford
@ 2021-03-20 16:04 ` endigma
  2021-03-21  5:40 ` [PR REVIEW] " sgn
                   ` (11 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-20 16:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-803390582

Comment:
> Possible to bump docker version? I have 19.03 on Void dev workstation, and there are some issues I'm having trouble tracking down - which don't occur on 20.10 ( that I'm running in staging & production).

This entire PR is a complicated version bump, docker changed their project structure.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR REVIEW] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (83 preceding siblings ...)
  2021-03-20 16:04 ` endigma
@ 2021-03-21  5:40 ` sgn
  2021-03-24 13:10 ` [PR PATCH] [Updated] " radiden
                   ` (10 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: sgn @ 2021-03-21  5:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#discussion_r598224782

Comment:
 I think we don't need this file

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (84 preceding siblings ...)
  2021-03-21  5:40 ` [PR REVIEW] " sgn
@ 2021-03-24 13:10 ` radiden
  2021-03-24 13:19 ` radiden
                   ` (9 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: radiden @ 2021-03-24 13:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by radiden against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 10852 bytes --]

From cd8d424157622da2e50452ae56d7de12877fb8e1 Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 20:37:57 +0100
Subject: [PATCH] docker: split package, update to 20.10.5

New package: docker-cli-20.10.5
New package: moby-20.10.5
---
 srcpkgs/docker                                |   1 +
 srcpkgs/docker-cli/template                   |  30 ++++
 srcpkgs/docker-cli/update                     |   1 +
 srcpkgs/docker/template                       | 138 ------------------
 srcpkgs/docker/update                         |   1 -
 srcpkgs/{docker => moby}/files/docker/log/run |   0
 srcpkgs/{docker => moby}/files/docker/run     |   0
 srcpkgs/moby/template                         |  51 +++++++
 srcpkgs/moby/update                           |   1 +
 9 files changed, 84 insertions(+), 139 deletions(-)
 create mode 120000 srcpkgs/docker
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 delete mode 100644 srcpkgs/docker/template
 delete mode 100644 srcpkgs/docker/update
 rename srcpkgs/{docker => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker => moby}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/moby/template
 create mode 100644 srcpkgs/moby/update

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..1f54c86ca232
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..747f2c67ca81
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,30 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+wrksrc="cli-${version}"
+build_style=go
+go_package="github.com/docker/cli/cmd/docker"
+go_import_path="github.com/docker/cli"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} moby"
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..2402ccb6eb59
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index e0830515a33e..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,138 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=19.03.15
-revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/moby/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
new file mode 100644
index 000000000000..6d8ef4e83729
--- /dev/null
+++ b/srcpkgs/moby/template
@@ -0,0 +1,51 @@
+# Template file for 'moby'
+pkgname=moby
+version=20.10.5
+revision=1
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd iptables xz"
+short_desc="Container engine for the Docker ecosystem"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+ https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/moby/update b/srcpkgs/moby/update
new file mode 100644
index 000000000000..3ff71c71f1f2
--- /dev/null
+++ b/srcpkgs/moby/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (85 preceding siblings ...)
  2021-03-24 13:10 ` [PR PATCH] [Updated] " radiden
@ 2021-03-24 13:19 ` radiden
  2021-03-24 13:26 ` radiden
                   ` (8 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: radiden @ 2021-03-24 13:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by radiden against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 11403 bytes --]

From cd8d424157622da2e50452ae56d7de12877fb8e1 Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 20:37:57 +0100
Subject: [PATCH 1/2] docker: split package, update to 20.10.5

New package: docker-cli-20.10.5
New package: moby-20.10.5
---
 srcpkgs/docker                                |   1 +
 srcpkgs/docker-cli/template                   |  30 ++++
 srcpkgs/docker-cli/update                     |   1 +
 srcpkgs/docker/template                       | 138 ------------------
 srcpkgs/docker/update                         |   1 -
 srcpkgs/{docker => moby}/files/docker/log/run |   0
 srcpkgs/{docker => moby}/files/docker/run     |   0
 srcpkgs/moby/template                         |  51 +++++++
 srcpkgs/moby/update                           |   1 +
 9 files changed, 84 insertions(+), 139 deletions(-)
 create mode 120000 srcpkgs/docker
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 delete mode 100644 srcpkgs/docker/template
 delete mode 100644 srcpkgs/docker/update
 rename srcpkgs/{docker => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker => moby}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/moby/template
 create mode 100644 srcpkgs/moby/update

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..1f54c86ca232
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..747f2c67ca81
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,30 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+wrksrc="cli-${version}"
+build_style=go
+go_package="github.com/docker/cli/cmd/docker"
+go_import_path="github.com/docker/cli"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} moby"
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..2402ccb6eb59
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index e0830515a33e..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,138 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=19.03.15
-revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/moby/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
new file mode 100644
index 000000000000..6d8ef4e83729
--- /dev/null
+++ b/srcpkgs/moby/template
@@ -0,0 +1,51 @@
+# Template file for 'moby'
+pkgname=moby
+version=20.10.5
+revision=1
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd iptables xz"
+short_desc="Container engine for the Docker ecosystem"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+ https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/moby/update b/srcpkgs/moby/update
new file mode 100644
index 000000000000..3ff71c71f1f2
--- /dev/null
+++ b/srcpkgs/moby/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From bb9db89557a12875a3509416ad8a868ff23b0a3b Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Wed, 24 Mar 2021 14:19:11 +0100
Subject: [PATCH 2/2] docker-cli: remove useless update file

---
 srcpkgs/docker-cli/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
deleted file mode 100644
index 2402ccb6eb59..000000000000
--- a/srcpkgs/docker-cli/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="v\K[\d\.]+(?=\.tar\.gz)"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (86 preceding siblings ...)
  2021-03-24 13:19 ` radiden
@ 2021-03-24 13:26 ` radiden
  2021-03-24 13:26 ` radiden
                   ` (7 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: radiden @ 2021-03-24 13:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by radiden against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 460036 bytes --]

From cd8d424157622da2e50452ae56d7de12877fb8e1 Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 20:37:57 +0100
Subject: [PATCH 001/305] docker: split package, update to 20.10.5

New package: docker-cli-20.10.5
New package: moby-20.10.5
---
 srcpkgs/docker                                |   1 +
 srcpkgs/docker-cli/template                   |  30 ++++
 srcpkgs/docker-cli/update                     |   1 +
 srcpkgs/docker/template                       | 138 ------------------
 srcpkgs/docker/update                         |   1 -
 srcpkgs/{docker => moby}/files/docker/log/run |   0
 srcpkgs/{docker => moby}/files/docker/run     |   0
 srcpkgs/moby/template                         |  51 +++++++
 srcpkgs/moby/update                           |   1 +
 9 files changed, 84 insertions(+), 139 deletions(-)
 create mode 120000 srcpkgs/docker
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 delete mode 100644 srcpkgs/docker/template
 delete mode 100644 srcpkgs/docker/update
 rename srcpkgs/{docker => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker => moby}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/moby/template
 create mode 100644 srcpkgs/moby/update

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..1f54c86ca232
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..747f2c67ca81
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,30 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+wrksrc="cli-${version}"
+build_style=go
+go_package="github.com/docker/cli/cmd/docker"
+go_import_path="github.com/docker/cli"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} moby"
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..2402ccb6eb59
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index e0830515a33e..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,138 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=19.03.15
-revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/moby/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
new file mode 100644
index 000000000000..6d8ef4e83729
--- /dev/null
+++ b/srcpkgs/moby/template
@@ -0,0 +1,51 @@
+# Template file for 'moby'
+pkgname=moby
+version=20.10.5
+revision=1
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd iptables xz"
+short_desc="Container engine for the Docker ecosystem"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+ https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/moby/update b/srcpkgs/moby/update
new file mode 100644
index 000000000000..3ff71c71f1f2
--- /dev/null
+++ b/srcpkgs/moby/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From e6d5f92e4bb42e2fa42a1805d62929aadee75b16 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 16 Mar 2021 20:29:50 +0100
Subject: [PATCH 002/305] libfilezilla: update to 0.27.1.

---
 common/shlibs                 | 4 ++--
 srcpkgs/libfilezilla/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 27fdddc90d72..4d4816a07c00 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2567,7 +2567,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.11 libfilezilla-0.26.0_1
+libfilezilla.so.12 libfilezilla-0.27.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -3969,4 +3969,4 @@ libtree-sitter.so.0 tree-sitter-0.19.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
-libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
\ No newline at end of file
+libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 3a3d090ca6e8..612ca6852ac0 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.26.0
+version=0.27.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=17ed226593e8e466ce3c3f8ce583b36c79f163189ead54d631613cc3da5c80bd
+checksum=400ef405c49fa486953b28b2bccdc445357a0650168a17a912936a5e6db9d840
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f4b5291291f3277c965c02e0b2d8c5b5e254c253 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 16 Mar 2021 20:30:11 +0100
Subject: [PATCH 003/305] filezilla: update to 3.53.0.

---
 srcpkgs/filezilla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index ed291a60db7a..e1376f1c9b6a 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.52.2
+version=3.53.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=c0788816928a26e8863c7dc26b158644e71bef29406df7d2eda37dc4810d6cdf
+checksum=3095e760df4f5400edb4daa3de1b212c49479360f2f45cc4ebb72530c87ce420
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From d1d6b38113642099f6f003bb0f5d86c47bffb8a9 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:19:44 +0000
Subject: [PATCH 004/305] kodi-platform: update to 20180302 and enable cross
 compilation

---
 common/shlibs                  |  2 +-
 srcpkgs/kodi-platform/template | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4d4816a07c00..487708693003 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3549,7 +3549,7 @@ libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
-libkodiplatform.so.18.0 kodi-platform-17.1.0_1
+libkodiplatform.so.19.0 kodi-platform-20180302_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index 9eed2ca9851a..33421576459c 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -1,7 +1,8 @@
 # Template file for 'kodi-platform'
 pkgname=kodi-platform
-version=17.1.0
+version=20180302
 revision=1
+wrksrc=kodi-platform-kodiplatform-${version}
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_LIBDIR=/usr/lib"
 makedepends="kodi-devel tinyxml-devel p8-platform-devel"
@@ -9,9 +10,12 @@ short_desc="Kodi platform support library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/xbmc/kodi-platform"
-distfiles="https://github.com/xbmc/kodi-platform/archive/${version}.tar.gz"
-checksum=39de7eb6db14de3fa33ca0e56243c3307e7598187e73ad930dabccdf068bd9b2
-nocross="kodi cmake files use absolute paths"
+distfiles="https://github.com/xbmc/kodi-platform/archive/kodiplatform-${version}.tar.gz"
+checksum=1d8ddbe444bd42f4b6f2babb9f78d6c1e152d828eff90b07308febf883c05b38
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+fi
 
 kodi-platform-devel_package() {
 	short_desc+=" - development files"

From 947f041c1c48dcb0ce7b732a2e0b8f1cc6e49061 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:31:02 +0000
Subject: [PATCH 005/305] kodi-addon-pvr-iptvsimple: enable cross compilation

---
 srcpkgs/kodi-addon-pvr-iptvsimple/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index 7628dd6bd31f..fb01d475f8d5 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-iptvsimple'
 pkgname=kodi-addon-pvr-iptvsimple
 version=7.5.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
 build_style=cmake
@@ -14,4 +14,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/kodi-pvr/pvr.iptvsimple"
 distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz"
 checksum=1cbe623e1eec0246c782398d8a8964d26b0fa68966c7f1422666068e50fb4e00
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From 1c0f12b1726914c21d4fab0f22709b1b8b804174 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:34:13 +0000
Subject: [PATCH 006/305] kodi-addon-pvr-hts: enable cross compilation

---
 srcpkgs/kodi-addon-pvr-hts/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template
index eeb0d6335275..de380b403e13 100644
--- a/srcpkgs/kodi-addon-pvr-hts/template
+++ b/srcpkgs/kodi-addon-pvr-hts/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-hts'
 pkgname=kodi-addon-pvr-hts
 version=8.2.3
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="pvr.hts-${version}-${_kodi_release}"
 build_style=cmake
@@ -12,8 +12,12 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/kodi-pvr/pvr.hts"
 distfiles="https://github.com/kodi-pvr/pvr.hts/archive/${version}-${_kodi_release}.tar.gz"
 checksum=bdaf63945d6552bead5a6e8ba4ffe1b8057e3b0c05b52c0fbf93a7834f652330
-nocross="depends on kodi-platform"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From b967a9d532801bba3af4c73d2c6fd43740a241d7 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:37:54 +0000
Subject: [PATCH 007/305] kodi-addon-pvr-zattoo: enable cross compilation

---
 srcpkgs/kodi-addon-pvr-zattoo/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 1ff40658bcf0..3851b0dddaca 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-zattoo'
 pkgname=kodi-addon-pvr-zattoo
 version=19.7.8.1
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="pvr.zattoo-${version}-${_kodi_release}"
 build_style=cmake
@@ -15,5 +15,9 @@ license="GPL-2.0-only"
 homepage="https://github.com/rbuehlma/pvr.zattoo"
 distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
 checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
-nocross="depends on kodi-platform"
 make_check=no # No target to "make test"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From 9ea3d38c07596189b96916d7966457bc257169af Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:42:11 +0000
Subject: [PATCH 008/305] kodi-addon-game-libretro: enable cross compilation

---
 srcpkgs/kodi-addon-game-libretro/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-game-libretro/template b/srcpkgs/kodi-addon-game-libretro/template
index 6e44c5a1de9c..fba2dea7971a 100644
--- a/srcpkgs/kodi-addon-game-libretro/template
+++ b/srcpkgs/kodi-addon-game-libretro/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-game-libretro'
 pkgname=kodi-addon-game-libretro
 version=2.2.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="game.libretro-${version}-${_kodi_release}"
 build_style=cmake
@@ -12,4 +12,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/kodi-game/game.libretro"
 distfiles="https://github.com/kodi-game/game.libretro/archive/${version}-${_kodi_release}.tar.gz"
 checksum=b92670065d5644b4766bb90ee51cc69730e11b4a8dc912bbe90dce7d07b39e32
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From a8a9c9bc75313aa27144a8c659527548f9688e39 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:44:05 +0000
Subject: [PATCH 009/305] kodi-addon-inputstream-rtmp: enable cross compilation

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index 3e7e4968f8c3..5c3b846e8cd7 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-inputstream-rtmp'
 pkgname=kodi-addon-inputstream-rtmp
 version=3.4.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
@@ -14,4 +14,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/xbmc/inputstream.rtmp"
 distfiles="https://github.com/xbmc/inputstream.rtmp/archive/${version}-${_kodi_release}.tar.gz"
 checksum=efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From 9c1ef4fef4517ecc19170d93e66f83b549e6e38e Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:47:26 +0000
Subject: [PATCH 010/305] kodi-addon-inputstream-adaptive: enable cross
 compilation

---
 srcpkgs/kodi-addon-inputstream-adaptive/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index ca978f1f3d81..579f39bfb0e4 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-inputstream-adaptive'
 pkgname=kodi-addon-inputstream-adaptive
 version=2.6.7
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
 build_style=cmake
@@ -13,4 +13,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/peak3d/inputstream.adaptive"
 distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
 checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From f1e55649c68e2a8ce62ae1f62ceff7f0e81e5d46 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:48:40 +0000
Subject: [PATCH 011/305] kodi-addon-vfs-sftp: enable cross compilation

---
 srcpkgs/kodi-addon-vfs-sftp/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 40d91f566d62..9c3e23e3b787 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-vfs-sftp'
 pkgname=kodi-addon-vfs-sftp
 version=2.0.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
@@ -13,4 +13,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/xbmc/vfs.sftp"
 distfiles="https://github.com/xbmc/vfs.sftp/archive/${version}-${_kodi_release}.tar.gz"
 checksum=b15c5dde7b3aadb3e82e61cb9b0440812b6c2f65b38c6c25aef726f97e746f68
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From f5bf2ec653b7b437236c15fad8bf17f5838f29db Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:50:16 +0000
Subject: [PATCH 012/305] kodi-addon-vfs-rar: enable cross compilation

---
 srcpkgs/kodi-addon-vfs-rar/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-vfs-rar/template b/srcpkgs/kodi-addon-vfs-rar/template
index 9ae75a72c860..5f36d7367eac 100644
--- a/srcpkgs/kodi-addon-vfs-rar/template
+++ b/srcpkgs/kodi-addon-vfs-rar/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-vfs-rar'
 pkgname=kodi-addon-vfs-rar
 version=4.0.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="vfs.rar-${version}-${_kodi_release}"
 build_style=cmake
@@ -12,4 +12,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/xbmc/vfs.rar"
 distfiles="https://github.com/xbmc/vfs.rar/archive/${version}-${_kodi_release}.tar.gz"
 checksum=1111d1f90cc4addc2adb0884b779f4b47e30abb2766ba1708053e5f100b514bf
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From 8d408263cb8bc2bee46beea041480b6348cf96c1 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <agausmann@fastmail.com>
Date: Mon, 15 Mar 2021 16:09:32 -0500
Subject: [PATCH 013/305] rpi-imager: update to 1.6.

---
 srcpkgs/rpi-imager/patches/disable-telemetry.patch | 11 +++++++++++
 srcpkgs/rpi-imager/template                        |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/rpi-imager/patches/disable-telemetry.patch

diff --git a/srcpkgs/rpi-imager/patches/disable-telemetry.patch b/srcpkgs/rpi-imager/patches/disable-telemetry.patch
new file mode 100644
index 000000000000..87dce16a58ce
--- /dev/null
+++ b/srcpkgs/rpi-imager/patches/disable-telemetry.patch
@@ -0,0 +1,11 @@
+--- config.h.orig	2021-03-16 12:22:48.315849306 -0500
++++ config.h	2021-03-16 12:23:00.273828304 -0500
+@@ -15,7 +15,7 @@
+ 
+ /* Phone home the name of images downloaded for image popularity ranking */
+ #define TELEMETRY_URL                     "https://rpi-imager-stats.raspberrypi.org/downloads"
+-#define TELEMETRY_ENABLED_DEFAULT         true
++#define TELEMETRY_ENABLED_DEFAULT         false
+ 
+ /* Hash algorithm for verifying (uncompressed image) checksum */
+ #define OSLIST_HASH_ALGORITHM             QCryptographicHash::Sha256
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index b00e8ed63e98..8a5cfed44136 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.5
-revision=2
+version=1.6
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel
@@ -12,7 +12,7 @@ maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
 distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum="972592886b4ff448b34bd420817f7b019c40fdab6ccef7acbc69986c1904e39c"
+checksum="811f9c261f82f75eefb9129570c47ff6653c1e9af08d9ed0b877261b4d184685"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk

From 3898fa26d83bf63e1ad05522603752de1a40f533 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 20:09:20 +0000
Subject: [PATCH 014/305] kodi-addon-peripheral-joystick: enable cross
 compilation

---
 srcpkgs/kodi-addon-peripheral-joystick/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index de72349fcf20..fd0f6ed39e55 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-peripheral-joystick'
 pkgname=kodi-addon-peripheral-joystick
 version=1.7.1
-revision=1
+revision=2
 _kodi_release="Matrix"
 wrksrc="peripheral.joystick-${version}-${_kodi_release}"
 build_style=cmake
@@ -13,4 +13,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/xbmc/peripheral.joystick"
 distfiles="https://github.com/xbmc/peripheral.joystick/archive/${version}-${_kodi_release}.tar.gz"
 checksum=4dc63c6c5bdad25881eeba800765d97c53b2583addf28e71bbcd67775452ecdb
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From bdf925ac240bf8832c047276c010f127668f04b9 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 20:09:46 +0000
Subject: [PATCH 015/305] kodi-binary-addons: enable cross compilation

---
 srcpkgs/kodi-binary-addons/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kodi-binary-addons/template b/srcpkgs/kodi-binary-addons/template
index 9f71df7ac085..c38b5403bbaa 100644
--- a/srcpkgs/kodi-binary-addons/template
+++ b/srcpkgs/kodi-binary-addons/template
@@ -1,14 +1,13 @@
 # Template file for 'kodi-binary-addons'
 pkgname=kodi-binary-addons
-version=18.6
-revision=2
+version=19.0
+revision=1
 build_style=meta
 depends="kodi-addon-pvr-zattoo kodi-addon-game-libretro
  kodi-addon-peripheral-joystick kodi-addon-inputstream-rtmp
  kodi-addon-inputstream-adaptive kodi-addon-pvr-hts kodi-addon-pvr-iptvsimple
- kodi-addon-vfs-rar"
+ kodi-addon-vfs-sftp kodi-addon-vfs-rar"
 short_desc="Meta-package for binary kodi addons"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="metapackage"
+license="Public Domain"
 homepage="https://kodi.tv"
-nocross="addons can't be cross-compiled yet"

From 95699ed6238af1a7fe56498198729f4341a1928d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Mar 2021 16:02:08 -0400
Subject: [PATCH 016/305] mosquitto: update to 2.0.9.

---
 srcpkgs/mosquitto/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 78d19cba196e..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,20 +1,21 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
-version=1.6.3
-revision=5
+version=2.0.9
+revision=1
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
+make_build_args="WITH_WEBSOCKETS=yes WITH_BUNDLED_DEPS=no"
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
-checkdepends="python bcunit-devel"
+makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
-checksum=9ef5cc75f4fe31d7bf50654ddf4728ad9e1ae2e5609a4b42ecbbcb4a209ed17e
+checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"

From 2d901ee4799ed11326375f836d03f34aa0acfdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Mar 2021 22:01:47 +0700
Subject: [PATCH 017/305] spdlog: build shared lib

---
 common/shlibs                              |  1 +
 srcpkgs/libspdlog                          |  1 +
 srcpkgs/spdlog/patches/fix-pkgconfig.patch | 12 ++++++++++++
 srcpkgs/spdlog/template                    | 15 +++++++++++----
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/libspdlog
 create mode 100644 srcpkgs/spdlog/patches/fix-pkgconfig.patch

diff --git a/common/shlibs b/common/shlibs
index 487708693003..bba9a0eb1939 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3970,3 +3970,4 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
 libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
+libspdlog.so.1 libspdlog-1.8.2_2
diff --git a/srcpkgs/libspdlog b/srcpkgs/libspdlog
new file mode 120000
index 000000000000..b624c8477e80
--- /dev/null
+++ b/srcpkgs/libspdlog
@@ -0,0 +1 @@
+spdlog
\ No newline at end of file
diff --git a/srcpkgs/spdlog/patches/fix-pkgconfig.patch b/srcpkgs/spdlog/patches/fix-pkgconfig.patch
new file mode 100644
index 000000000000..99c8b7ff1068
--- /dev/null
+++ b/srcpkgs/spdlog/patches/fix-pkgconfig.patch
@@ -0,0 +1,12 @@
+Index: spdlog-1.8.2/cmake/spdlog.pc.in
+===================================================================
+--- spdlog-1.8.2.orig/cmake/spdlog.pc.in
++++ spdlog-1.8.2/cmake/spdlog.pc.in
+@@ -8,6 +8,6 @@ Description: Fast C++ logging library.
+ URL: https://github.com/gabime/@PROJECT_NAME@
+ Version: @SPDLOG_VERSION@
+ CFlags: -I${includedir} @PKG_CONFIG_DEFINES@
+-Libs: -L${libdir} -lspdlog -pthread
++Libs: -L${libdir} -lspdlog -lfmt -pthread
+ Requires: @PKG_CONFIG_REQUIRES@
+ 
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 2a8e1c9e8f16..ecf3e97a14ce 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,22 +1,29 @@
 # Template file for 'spdlog'
 pkgname=spdlog
 version=1.8.2
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON"
+configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
+ -DSPDLOG_BUILD_SHARED=ON"
 hostmakedepends="pkg-config"
 makedepends="fmt-devel"
+depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
 checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+patch_args=-Np1
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
 fi
 
-post_install() {
-	vlicense LICENSE
+libspdlog_package() {
+	short_desc+=" - libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vlicense LICENSE
+	}
 }

From d9aa90644bd98d03b2c2ba194938f61677ebc1c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Mar 2021 22:02:20 +0700
Subject: [PATCH 018/305] Waybar: use shared spdlog

---
 srcpkgs/Waybar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 16588a75f874..13b84b38d847 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.5
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}

From 609d5d4710a93b345210bab8ef9286a7674d26ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Mar 2021 22:02:29 +0700
Subject: [PATCH 019/305] gerbera: use shared spdlog

---
 srcpkgs/gerbera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 451f9eff5398..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

From b61bed9faa055d399d697308a1dbba23b2bd9a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Mar 2021 22:02:34 +0700
Subject: [PATCH 020/305] libixion: use shared spdlog

---
 srcpkgs/libixion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 2d709b3f88b6..6ffb939d830b 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
 # Template file for 'libixion'
 pkgname=libixion
 version=0.16.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fmt-devel mdds python3-devel spdlog"

From fc1d01c94c304913ce4463216f6c27239a8b5a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Mar 2021 22:02:42 +0700
Subject: [PATCH 021/305] nheko: use shared spdlog

---
 srcpkgs/nheko/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 541d113a16e6..dd635f70f249 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.7.2
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel

From aab97d1f0e62b7ba967c406fb84857159ccca683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Mar 2021 23:26:33 +0700
Subject: [PATCH 022/305] cryfs: un-vendor, build with None build type

---
 .../cryfs/patches/allow-build-type-none.patch |  33 ++++
 srcpkgs/cryfs/patches/de-vendor.patch         | 180 ++++++++++++++++++
 srcpkgs/cryfs/patches/fix-test.patch          |  22 +++
 .../rename-simple-to-basic-filesink.patch     |  21 ++
 srcpkgs/cryfs/patches/spdlog-include.patch    |  33 ++++
 srcpkgs/cryfs/template                        |  33 +++-
 6 files changed, 319 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cryfs/patches/allow-build-type-none.patch
 create mode 100644 srcpkgs/cryfs/patches/de-vendor.patch
 create mode 100644 srcpkgs/cryfs/patches/fix-test.patch
 create mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
 create mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch

diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch
new file mode 100644
index 000000000000..e591974c05f4
--- /dev/null
+++ b/srcpkgs/cryfs/patches/allow-build-type-none.patch
@@ -0,0 +1,33 @@
+Index: cryfs-0.10.2/doc/CMakeLists.txt
+===================================================================
+--- cryfs-0.10.2.orig/doc/CMakeLists.txt
++++ cryfs-0.10.2/doc/CMakeLists.txt
+@@ -15,6 +15,5 @@ ELSE (WIN32)
+ 
+ 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz
+ 			DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+-			CONFIGURATIONS Release
+ 	)
+ ENDIF(WIN32)
+Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
+===================================================================
+--- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt
++++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
+@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N
+ target_activate_cpp14(${PROJECT_NAME}_bin)
+ 
+ install(TARGETS ${PROJECT_NAME}_bin
+-        CONFIGURATIONS Debug Release RelWithDebInfo
+         DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
+Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
+===================================================================
+--- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt
++++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
+@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N
+ target_activate_cpp14(${PROJECT_NAME}_bin)
+ 
+ install(TARGETS ${PROJECT_NAME}_bin
+-		CONFIGURATIONS Debug Release RelWithDebInfo
+ 		DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch
new file mode 100644
index 000000000000..4909cad7b84a
--- /dev/null
+++ b/srcpkgs/cryfs/patches/de-vendor.patch
@@ -0,0 +1,180 @@
+Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
+===================================================================
+--- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
++++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
+@@ -1,6 +1,6 @@
+ #include "cpp-utils/crypto/cryptopp_byte.h"
+ #include "Gzip.h"
+-#include <vendor_cryptopp/gzip.h>
++#include <cryptopp/gzip.h>
+ 
+ using cpputils::Data;
+ 
+Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h
++++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
+@@ -2,7 +2,7 @@
+ #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
+ #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
+ 
+-#include <vendor_cryptopp/cryptlib.h>
++#include <cryptopp/cryptlib.h>
+ 
+ // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
+ // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
+Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp
++++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+@@ -1,6 +1,6 @@
+ #include "Hash.h"
+ #include <cpp-utils/random/Random.h>
+-#include <vendor_cryptopp/sha.h>
++#include <cryptopp/sha.h>
+ 
+ using cpputils::Random;
+ using CryptoPP::SHA512;
+Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
++++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+@@ -1,5 +1,5 @@
+ #include "Scrypt.h"
+-#include <vendor_cryptopp/scrypt.h>
++#include <cryptopp/scrypt.h>
+ 
+ using std::string;
+ 
+Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
++++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
+@@ -7,7 +7,7 @@
+ #include "../../data/Data.h"
+ #include "../../random/Random.h"
+ #include <boost/optional.hpp>
+-#include <vendor_cryptopp/modes.h>
++#include <cryptopp/modes.h>
+ #include "Cipher.h"
+ #include "EncryptionKey.h"
+ 
+Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
++++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
+@@ -6,7 +6,7 @@
+ #include "../../data/FixedSizeData.h"
+ #include "../../data/Data.h"
+ #include "../../random/Random.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+ #include "Cipher.h"
+ #include "EncryptionKey.h"
+ 
+Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h
++++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
+@@ -2,11 +2,11 @@
+ #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
+ 
+-#include <vendor_cryptopp/aes.h>
+-#include <vendor_cryptopp/twofish.h>
+-#include <vendor_cryptopp/serpent.h>
+-#include <vendor_cryptopp/cast.h>
+-#include <vendor_cryptopp/mars.h>
++#include <cryptopp/aes.h>
++#include <cryptopp/twofish.h>
++#include <cryptopp/serpent.h>
++#include <cryptopp/cast.h>
++#include <cryptopp/mars.h>
+ #include "GCM_Cipher.h"
+ #include "CFB_Cipher.h"
+ 
+Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp
++++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+@@ -1,6 +1,6 @@
+ #include "Data.h"
+ #include <stdexcept>
+-#include <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+ #include <cpp-utils/crypto/cryptopp_byte.h>
+ 
+ using std::istream;
+Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h
++++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+@@ -2,7 +2,7 @@
+ #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
+ #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
+ 
+-#include <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+ #include <string>
+ #include <cstring>
+ #include "../assert/assert.h"
+Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h
++++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
+@@ -4,7 +4,7 @@
+ 
+ #include "cpp-utils/crypto/cryptopp_byte.h"
+ #include "RandomGenerator.h"
+-#include <vendor_cryptopp/osrng.h>
++#include <cryptopp/osrng.h>
+ 
+ namespace cpputils {
+     class OSRandomGenerator final : public RandomGenerator {
+Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h
++++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+@@ -4,7 +4,7 @@
+ 
+ #include "../thread/LoopThread.h"
+ #include "ThreadsafeRandomDataBuffer.h"
+-#include <vendor_cryptopp/osrng.h>
++#include <cryptopp/osrng.h>
+ 
+ namespace cpputils {
+     //TODO Test
+Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+===================================================================
+--- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp
++++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+@@ -1,7 +1,7 @@
+ #include "BasedirMetadata.h"
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
+-#include <vendor_cryptopp/sha.h>
++#include <cryptopp/sha.h>
+ #include <boost/filesystem/operations.hpp>
+ #include "LocalStateDir.h"
+ #include <cpp-utils/logging/logging.h>
+Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+===================================================================
+--- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp
++++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+@@ -3,7 +3,7 @@
+ #include <vector>
+ #include <boost/filesystem.hpp>
+ #include <cpp-utils/data/Data.h>
+-#include <vendor_cryptopp/hex.h>
++#include <cryptopp/hex.h>
+ #include <cpp-utils/crypto/symmetric/ciphers.h>
+ #include <cpp-utils/tempfile/TempFile.h>
+ #include <cryfs/config/CryConfigFile.h>
+Index: cryfs-0.10.2/vendor/CMakeLists.txt
+===================================================================
+--- cryfs-0.10.2.orig/vendor/CMakeLists.txt
++++ cryfs-0.10.2/vendor/CMakeLists.txt
+@@ -1,3 +1 @@
+ add_subdirectory(googletest)
+-add_subdirectory(spdlog)
+-add_subdirectory(cryptopp)
diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch
new file mode 100644
index 000000000000..d3a5847b1a3c
--- /dev/null
+++ b/srcpkgs/cryfs/patches/fix-test.patch
@@ -0,0 +1,22 @@
+Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
+===================================================================
+--- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h
++++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
+@@ -11,8 +11,7 @@ class MockLogger final {
+ public:
+     MockLogger():
+             _capturedLogData(),
+-            _sink(std::make_shared<spdlog::sinks::ostream_sink<std::mutex>>(_capturedLogData, true)),
+-            _logger(spdlog::create("MockLogger", {_sink})) {
++            _logger(spdlog::create<spdlog::sinks::ostream_sink_mt>("MockLogger", _capturedLogData, true)) {
+     }
+ 
+     ~MockLogger() {
+@@ -28,7 +27,6 @@ public:
+     }
+ private:
+     std::ostringstream _capturedLogData;
+-    std::shared_ptr<spdlog::sinks::ostream_sink<std::mutex>> _sink;
+     std::shared_ptr<spdlog::logger> _logger;
+ };
+ 
diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
new file mode 100644
index 000000000000..08513cb4d0ca
--- /dev/null
+++ b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
@@ -0,0 +1,21 @@
+Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp
+===================================================================
+--- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp
++++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp
+@@ -27,6 +27,7 @@
+ #include "Environment.h"
+ #include <cryfs/CryfsException.h>
+ #include <cpp-utils/thread/debugging.h>
++#include <spdlog/sinks/basic_file_sink.h>
+ 
+ //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.
+ //TODO Factor out class handling askPassword
+@@ -310,7 +311,7 @@ namespace cryfs_cli {
+         //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog.
+         if (options.logFile() != none) {
+             cpputils::logging::setLogger(
+-                spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
++                spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
+         } else if (options.foreground()) {
+             cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
+         } else {
diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch
new file mode 100644
index 000000000000..2c1c5a926cf3
--- /dev/null
+++ b/srcpkgs/cryfs/patches/spdlog-include.patch
@@ -0,0 +1,33 @@
+Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h
++++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h
+@@ -7,6 +7,7 @@
+ #endif
+ 
+ #include <spdlog/spdlog.h>
++#include <spdlog/sinks/stdout_sinks.h>
+ #include "../macros.h"
+ 
+ namespace cpputils {
+Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h
+===================================================================
+--- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h
++++ cryfs-0.10.2/src/cpp-utils/logging/logging.h
+@@ -5,6 +5,7 @@
+ #include "Logger.h"
+ #include <stdexcept>
+ #include <spdlog/fmt/ostr.h>
++#include <spdlog/sinks/syslog_sink.h>
+ 
+ #if defined(_MSC_VER)
+ #include <spdlog/sinks/msvc_sink.h>
+@@ -75,7 +76,7 @@ namespace cpputils {
+ #if defined(_MSC_VER)
+           return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
+ #else
+-          return spdlog::syslog_logger(name, name, LOG_PID);
++          return spdlog::syslog_logger_mt(name, name, LOG_PID);
+ #endif
+         }
+     }
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index e8022335f019..76880174d7b9 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -4,9 +4,11 @@ version=0.10.2
 revision=1
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off"
-hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel"
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+ -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
+hostmakedepends="pkg-config python3"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
+ spdlog"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
@@ -15,7 +17,32 @@ homepage="https://www.cryfs.org"
 changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt"
 distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz"
 checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2
+patch_args=-Np1
 
 if [ "${XBPS_CHECK_PKGS}" ]; then
 	configure_args+=" -DBUILD_TESTING=on"
 fi
+
+post_patch() {
+	rm -rf vendor/cryptopp
+	rm -rf vendor/spdlog
+}
+
+pre_configure() {
+	local _pkg_config="$($PKG_CONFIG --cflags spdlog)"
+	CFLAGS+=" $_pkg_config"
+	CXXFLAGS+=" $_pkg_config"
+}
+
+do_check() {
+	cd ${wrksrc}/build
+	# XXX: check their Travis-CI script on update
+	./test/gitversion/gitversion-test
+	./test/cpp-utils/cpp-utils-test
+	./test/parallelaccessstore/parallelaccessstore-test
+	./test/blockstore/blockstore-test
+	./test/blobstore/blobstore-test
+	./test/cryfs/cryfs-test
+	# ./test/cryfs-cli/cryfs-cli-test
+	cd ${wrksrc}
+}

From 593dc5c7bc7efd2fab9850d2001ad605725cd73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 17 Mar 2021 06:35:13 +0700
Subject: [PATCH 023/305] cryfs: pick up the de-vendoring

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 76880174d7b9..80938f905686 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None

From b8d01206eadc8cf8f8e3f0dd4b09370e3c653176 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 16 Mar 2021 23:56:42 +0100
Subject: [PATCH 024/305] serd: disable test coverage

---
 srcpkgs/serd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/serd/template b/srcpkgs/serd/template
index b024f166830b..ebd304179695 100644
--- a/srcpkgs/serd/template
+++ b/srcpkgs/serd/template
@@ -11,7 +11,7 @@ distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
 checksum=affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf
 
 if [ "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" --test"
+	configure_args+=" --test --no-coverage"
 fi
 
 do_check() {

From dc709e826de5fa8cdf9034cda5253836bb69ffcb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 16 Mar 2021 23:51:16 +0100
Subject: [PATCH 025/305] sratom: update to 0.6.8.

---
 srcpkgs/sratom/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sratom/template b/srcpkgs/sratom/template
index ef9b76fc7ab4..377da8500fdc 100644
--- a/srcpkgs/sratom/template
+++ b/srcpkgs/sratom/template
@@ -1,6 +1,6 @@
 # Template file for 'sratom'
 pkgname=sratom
-version=0.6.6
+version=0.6.8
 revision=1
 build_style=waf3
 hostmakedepends="pkg-config"
@@ -10,14 +10,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="http://drobilla.net/software/sratom/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
-checksum=fb910bf62a5e69f4430bf09653d386fc4de9ff02bfd58635e1d45cbd31481b9d
+checksum=3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-T"
+	configure_args+=" --test --no-coverage"
 fi
 
 do_check() {
-	./build/sratom_test
+	./waf test
 }
 
 post_install() {

From 77f3265171f70327a11c5455cece30f9379e95f6 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 05:26:46 +0300
Subject: [PATCH 026/305] btrbk: update to 0.31.1

---
 srcpkgs/btrbk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template
index 321ececdd120..2f2d73653a8f 100644
--- a/srcpkgs/btrbk/template
+++ b/srcpkgs/btrbk/template
@@ -1,6 +1,6 @@
 # Template file for 'btrbk'
 pkgname=btrbk
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-makefile
 make_install_args="BINDIR=/usr/bin"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="http://digint.ch/btrbk"
 changelog=https://github.com/digint/btrbk/blob/master/ChangeLog
 distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz"
-checksum=e8a7e9de0f3227a9b8b2ad9d84207292fc66022d2cdd594ac86c6c19c10797f2
+checksum=ab461532d8f60ec794bddc8942e5a5bb055d92eb638b7b141134fe7d972b7a7a
 conf_files="/etc/btrbk/*"
 
 post_install() {

From 6b1b37729994e234824c3d5f8f7652793161d665 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 16 Mar 2021 19:48:40 +0100
Subject: [PATCH 027/305] python3-sympy: update to 1.7.1.

---
 srcpkgs/python3-sympy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template
index 484263ebfc78..a1fadb7c98f1 100644
--- a/srcpkgs/python3-sympy/template
+++ b/srcpkgs/python3-sympy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-sympy'
 pkgname=python3-sympy
-version=1.7
+version=1.7.1
 revision=1
 wrksrc="sympy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://sympy.org/"
 distfiles="${PYPI_SITE}/s/sympy/sympy-${version}.tar.gz"
-checksum=9104004669cda847f38cfd8cd16dd174952c537349dbae740fea5331d2b3a51b
+checksum=a3de9261e97535b83bb8607b0da2c7d03126650fafea2b2789657b229c246b2e
 
 post_install() {
 	vman doc/man/isympy.1

From 417882feaf500aeaee569b8a6688366d6d43b9a8 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 16 Mar 2021 12:00:55 +0100
Subject: [PATCH 028/305] vscode: update to 1.54.3

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 27c14c84e7af..ee7d308e8875 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.54.1
+version=1.54.3
 revision=1
 _electronver=9.4.1
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=0afd83b04b5ab0c9f7b4cae6d10abc16ca2d36b9dabc3080734cf48a41ce5f7e
+checksum=ea2cf3481b9a878aa5d4000289d238551d0ad4fe04ca2f3fea35bbe86026a369
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From c16af524fedb1b25dda5d3ab2abf3d57b747e209 Mon Sep 17 00:00:00 2001
From: ndgnuh <ndgnuh@protonmail.com>
Date: Mon, 15 Mar 2021 01:06:36 +0700
Subject: [PATCH 029/305] ibus-bamboo: update to 0.7.0.

- Wayland: Implement foreign toplevel manager protocol.
- Fix focus window issue on Gnome Activity.
---
 srcpkgs/ibus-bamboo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 3713b014d121..dfb54fa0b086 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,16 +1,16 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.6.7
+version=0.7.0
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"
 short_desc="Vietnamese input method for ibus"
-maintainer="ndgnuh <ndgnuh99@gmail.com>"
+maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum="92d49fe232f241b3e62348c49883aed8a439f256bf6c39034270e069e6c34563"
+checksum="4ac62345bfcebb87b8cd6af8657887f281e9423ff764435fc00045c400afb0dc"
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {

From 8ece78584a65973f0e610383ba104049a9eecb99 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Wed, 17 Mar 2021 08:45:36 +0000
Subject: [PATCH 030/305] gnome-shell: update to 3.38.4.

Closes: #29528 [via git-merge-pr]
---
 srcpkgs/gnome-shell/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c2c623830777..c004018f719c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.3
-revision=2
+version=3.38.4
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5345b418cb12a972955ce5cceaed6662480027336b5c51daea5730575b621ced
+checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
 
 # needs X
 do_check() {

From 07bad0dba713a22faeb14ed7e4c6cc06dabfefa4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 9 Mar 2021 02:31:45 +1100
Subject: [PATCH 031/305] ppp: update to 2.4.9.

---
 srcpkgs/ppp/patches/CVE-2015-3310.patch    |  18 ---
 srcpkgs/ppp/patches/CVE-2020-8597.patch    |  39 -------
 srcpkgs/ppp/patches/musl.patch             | 123 ---------------------
 srcpkgs/ppp/patches/netinet_in_h_fix.patch |  38 -------
 srcpkgs/ppp/patches/openssl_DES.patch      | 110 ------------------
 srcpkgs/ppp/template                       |  40 +------
 srcpkgs/ppp/version                        |   1 +
 7 files changed, 7 insertions(+), 362 deletions(-)
 delete mode 100644 srcpkgs/ppp/patches/CVE-2015-3310.patch
 delete mode 100644 srcpkgs/ppp/patches/CVE-2020-8597.patch
 delete mode 100644 srcpkgs/ppp/patches/netinet_in_h_fix.patch
 delete mode 100644 srcpkgs/ppp/patches/openssl_DES.patch
 create mode 100644 srcpkgs/ppp/version

diff --git a/srcpkgs/ppp/patches/CVE-2015-3310.patch b/srcpkgs/ppp/patches/CVE-2015-3310.patch
deleted file mode 100644
index e60751a032b5..000000000000
--- a/srcpkgs/ppp/patches/CVE-2015-3310.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix buffer overflow in rc_mksid()
-
-rc_mksid converts the PID of pppd to hex to generate a pseudo-unique string.
-If the process id is bigger than 65535 (FFFF), its hex representation will be
-longer than 4 characters, resulting in a buffer overflow.
- 
-The bug can be exploited to cause a remote DoS.
---- pppd/plugins/radius/util.c
-+++ pppd/plugins/radius/util.c
-@@ -77,7 +77,7 @@ rc_mksid (void)
-   static unsigned short int cnt = 0;
-   sprintf (buf, "%08lX%04X%02hX",
- 	   (unsigned long int) time (NULL),
--	   (unsigned int) getpid (),
-+	   (unsigned int) getpid () & 0xFFFF,
- 	   cnt & 0xFF);
-   cnt++;
-   return buf;
diff --git a/srcpkgs/ppp/patches/CVE-2020-8597.patch b/srcpkgs/ppp/patches/CVE-2020-8597.patch
deleted file mode 100644
index e0988a886e0a..000000000000
--- a/srcpkgs/ppp/patches/CVE-2020-8597.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426.patch
-
-From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001
-From: Paul Mackerras <paulus@ozlabs.org>
-Date: Mon, 3 Feb 2020 15:53:28 +1100
-Subject: [PATCH] pppd: Fix bounds check in EAP code
-
-Given that we have just checked vallen < len, it can never be the case
-that vallen >= len + sizeof(rhostname).  This fixes the check so we
-actually avoid overflowing the rhostname array.
-
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
----
- pppd/eap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/eap.c b/pppd/eap.c
-index 94407f56..1b93db01 100644
---- pppd/eap.c
-+++ pppd/eap.c
-@@ -1420,7 +1420,7 @@ int len;
- 		}
- 
- 		/* Not so likely to happen. */
--		if (vallen >= len + sizeof (rhostname)) {
-+		if (len - vallen >= sizeof (rhostname)) {
- 			dbglog("EAP: trimming really long peer name down");
- 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
- 			rhostname[sizeof (rhostname) - 1] = '\0';
-@@ -1846,7 +1846,7 @@ int len;
- 		}
- 
- 		/* Not so likely to happen. */
--		if (vallen >= len + sizeof (rhostname)) {
-+		if (len - vallen >= sizeof (rhostname)) {
- 			dbglog("EAP: trimming really long peer name down");
- 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
- 			rhostname[sizeof (rhostname) - 1] = '\0';
diff --git a/srcpkgs/ppp/patches/musl.patch b/srcpkgs/ppp/patches/musl.patch
index 802409fc9800..7ed236180aab 100644
--- a/srcpkgs/ppp/patches/musl.patch
+++ b/srcpkgs/ppp/patches/musl.patch
@@ -1,128 +1,5 @@
---- pppd/Makefile.linux
-+++ pppd/Makefile.linux
-@@ -126,7 +126,7 @@ LIBS        += -lcrypt
- endif
- 
- ifdef USE_LIBUTIL
--CFLAGS += -DHAVE_LOGWTMP=1
-+#CFLAGS        += -DHAVE_LOGWTMP=1
- LIBS   += -lutil
- endif
- 
---- pppd/plugins/rp-pppoe/if.c
-+++ pppd/plugins/rp-pppoe/if.c
-@@ -30,10 +30,6 @@ static char const RCSID[] =
- #include <linux/if_packet.h>
- #endif
- 
--#ifdef HAVE_NET_ETHERNET_H
--#include <net/ethernet.h>
--#endif
--
- #ifdef HAVE_ASM_TYPES_H
- #include <asm/types.h>
- #endif
---- pppd/plugins/rp-pppoe/plugin.c
-+++ pppd/plugins/rp-pppoe/plugin.c
-@@ -46,7 +46,6 @@ static char const RCSID[] =
- #include <unistd.h>
- #include <fcntl.h>
- #include <signal.h>
--#include <net/ethernet.h>
- #include <net/if_arp.h>
- #include <linux/ppp_defs.h>
- #include <linux/if_pppox.h>
---- pppd/plugins/rp-pppoe/pppoe-discovery.c
-+++ pppd/plugins/rp-pppoe/pppoe-discovery.c
-@@ -27,10 +27,6 @@
- #include <linux/if_packet.h>
- #endif
- 
--#ifdef HAVE_NET_ETHERNET_H
--#include <net/ethernet.h>
--#endif
--
- #ifdef HAVE_ASM_TYPES_H
- #include <asm/types.h>
- #endif
-@@ -55,6 +51,8 @@ void die(int status)
-        exit(status);
- }
- 
-+#define error(x...) fprintf(stderr, x)
-+
- /* Initialize frame types to RFC 2516 values.  Some broken peers apparently
-    use different frame types... sigh... */
- 
---- pppd/plugins/rp-pppoe/pppoe.h
-+++ pppd/plugins/rp-pppoe/pppoe.h
-@@ -86,18 +86,6 @@ typedef unsigned long UINT32_t;
- 
- #include <netinet/in.h>
- 
--#ifdef HAVE_NETINET_IF_ETHER_H
--#include <sys/types.h>
--
--#ifdef HAVE_SYS_SOCKET_H
--#include <sys/socket.h>
--#endif
--#ifndef HAVE_SYS_DLPI_H
--#include <netinet/if_ether.h>
--#endif
--#endif
--
--
- 
  /* Ethernet frame types according to RFC 2516 */
  #define ETH_PPPOE_DISCOVERY 0x8863
---- pppd/sys-linux.c
-+++ pppd/sys-linux.c
-@@ -102,19 +102,11 @@
- #define MAX_ADDR_LEN 7
- #endif
- 
--#if __GLIBC__ >= 2
- #include <asm/types.h>         /* glibc 2 conflicts with linux/types.h */
- #include <net/if.h>
- #include <net/if_arp.h>
- #include <net/route.h>
- #include <netinet/if_ether.h>
--#else
--#include <linux/types.h>
--#include <linux/if.h>
--#include <linux/if_arp.h>
--#include <linux/route.h>
--#include <linux/if_ether.h>
--#endif
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
-
---- include/linux/ppp_defs.h.orig	2015-05-10 10:59:27.959155977 +0200
-+++ include/linux/ppp_defs.h	2015-05-10 10:59:50.190403246 +0200
-@@ -50,6 +50,9 @@
- #ifndef _PPP_DEFS_H_
- #define _PPP_DEFS_H_
- 
-+#ifndef __P
-+# define __P(x) x
-+#endif
- /*
-  * The basic PPP frame.
-  */
---- pppd/magic.h.orig	2015-05-10 11:00:16.687697962 +0200
-+++ pppd/magic.h	2015-05-10 11:00:34.030890864 +0200
-@@ -42,6 +42,10 @@
-  * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
-  */
- 
-+#ifndef __P
-+# define __P(x) x
-+#endif
-+
- void magic_init __P((void));	/* Initialize the magic number generator */
- u_int32_t magic __P((void));	/* Returns the next magic number */
- 
 --- include/net/ppp_defs.h.orig	2015-05-10 11:09:54.505127657 +0200
 +++ include/net/ppp_defs.h	2015-05-10 11:10:10.753309024 +0200
 @@ -38,6 +38,8 @@
diff --git a/srcpkgs/ppp/patches/netinet_in_h_fix.patch b/srcpkgs/ppp/patches/netinet_in_h_fix.patch
deleted file mode 100644
index ac69c98caafc..000000000000
--- a/srcpkgs/ppp/patches/netinet_in_h_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 50a2997b256e0e0ef7a46fae133f56f60fce539c Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 9 Jan 2017 13:34:23 +0000
-Subject: [PATCH] pppoe: include netinet/in.h before linux/in.h
-
-This fixes builds with newer kernels. Basically, <netinet/in.h> needs to be
-included before <linux/in.h> otherwise the earlier, unaware of the latter,
-tries to redefine symbols and structures. Also, <linux/if_pppox.h> doesn't work
-alone anymore, since it pulls the headers in the wrong order, so we better
-include <netinet/in.h> early.
----
- pppd/plugins/rp-pppoe/pppoe.h | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
-index 9ab2eee3..c4aaa6e6 100644
---- pppd/plugins/rp-pppoe/pppoe.h
-+++ pppd/plugins/rp-pppoe/pppoe.h
-@@ -47,6 +47,10 @@
- #include <sys/socket.h>
- #endif
- 
-+/* This has to be included before Linux 4.8's linux/in.h
-+ * gets dragged in. */
-+#include <netinet/in.h>
-+
- /* Ugly header files on some Linux boxes... */
- #if defined(HAVE_LINUX_IF_H)
- #include <linux/if.h>
-@@ -84,8 +88,6 @@ typedef unsigned long UINT32_t;
- #include <linux/if_ether.h>
- #endif
- 
--#include <netinet/in.h>
--
-
- /* Ethernet frame types according to RFC 2516 */
- #define ETH_PPPOE_DISCOVERY 0x8863
diff --git a/srcpkgs/ppp/patches/openssl_DES.patch b/srcpkgs/ppp/patches/openssl_DES.patch
deleted file mode 100644
index c631039446e5..000000000000
--- a/srcpkgs/ppp/patches/openssl_DES.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
-Date: Fri, 6 Apr 2018 14:27:18 +0200
-Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped
-libcrypt.  The libxcrypt standalone package can be used instead, but
-it dropped the old setkey/encrypt API which ppp uses for DES.  There
-is support for using openssl in pppcrypt.c, but it contains typos
-preventing it from compiling and seems to be written for an ancient
-openssl version.
-
-This updates the code to use current openssl.
-
-[paulus@ozlabs.org - wrote the commit description, fixed comment in
- Makefile.linux.]
-
-Signed-off-by: Jaroslav Å karvada <jskarvad@redhat.com>
-Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
----
- pppd/Makefile.linux |  7 ++++---
- pppd/pppcrypt.c     | 18 +++++++++---------
- 2 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 36d2b036..8d5ce99d 100644
---- pppd/Makefile.linux
-+++ pppd/Makefile.linux
-@@ -35,10 +35,10 @@ endif
- COPTS = -O2 -pipe -Wall -g
- LIBS =
- 
--# Uncomment the next 2 lines to include support for Microsoft's
-+# Uncomment the next line to include support for Microsoft's
- # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
- CHAPMS=y
--USE_CRYPT=y
-+#USE_CRYPT=y
- # Don't use MSLANMAN unless you really know what you're doing.
- #MSLANMAN=y
- # Uncomment the next line to include support for MPPE.  CHAPMS (above) must
-@@ -137,7 +137,8 @@ endif
- 
- ifdef NEEDDES
- ifndef USE_CRYPT
--LIBS     += -ldes $(LIBS)
-+#CFLAGS   += -I/usr/include/openssl
-+LIBS     += -lcrypto
- else
- CFLAGS   += -DUSE_CRYPT=1
- endif
-diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c
-index 8b85b132..6b35375e 100644
---- pppd/pppcrypt.c
-+++ pppd/pppcrypt.c
-@@ -64,7 +64,7 @@ u_char *des_key;	/* OUT 64 bit DES key with parity bits added */
- 	des_key[7] = Get7Bits(key, 49);
- 
- #ifndef USE_CRYPT
--	des_set_odd_parity((des_cblock *)des_key);
-+	DES_set_odd_parity((DES_cblock *)des_key);
- #endif
- }
- 
-@@ -158,25 +158,25 @@ u_char *clear;	/* OUT 8 octets */
- }
- 
- #else /* USE_CRYPT */
--static des_key_schedule	key_schedule;
-+static DES_key_schedule	key_schedule;
- 
- bool
- DesSetkey(key)
- u_char *key;
- {
--	des_cblock des_key;
-+	DES_cblock des_key;
- 	MakeKey(key, des_key);
--	des_set_key(&des_key, key_schedule);
-+	DES_set_key(&des_key, &key_schedule);
- 	return (1);
- }
- 
- bool
--DesEncrypt(clear, key, cipher)
-+DesEncrypt(clear, cipher)
- u_char *clear;	/* IN  8 octets */
- u_char *cipher;	/* OUT 8 octets */
- {
--	des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher,
--	    key_schedule, 1);
-+	DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher,
-+	    &key_schedule, 1);
- 	return (1);
- }
- 
-@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear)
- u_char *cipher;	/* IN  8 octets */
- u_char *clear;	/* OUT 8 octets */
- {
--	des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear,
--	    key_schedule, 0);
-+	DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear,
-+	    &key_schedule, 0);
- 	return (1);
- }
- 
diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 5986bd713fd6..265de99e0753 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -5,15 +5,15 @@
 # * NetworkManager-l2tp
 # When update this package
 pkgname=ppp
-version=2.4.7
-revision=14
+version=2.4.9
+revision=1
 makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"
 homepage="https://ppp.samba.org/"
 distfiles="https://ftp.samba.org/pub/ppp/ppp-$version.tar.gz"
-checksum=02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30
+checksum=f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d
 make_dirs="
  /etc/ppp/ipv6-down.d 0755 root root
  /etc/ppp/peers 0755 root root"
@@ -26,39 +26,16 @@ conf_files="
  /etc/ppp/chap-secrets
  /etc/ppp/pap-secrets"
 
-CFLAGS="-D_GNU_SOURCE"
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	makedepends+=" musl-legacy-compat"
-fi
-
 do_configure() {
-	# Custom CFLAGS.
-	find -name "Makefile.linux" -exec sed -i "{}" \
-		-e "s;CFLAGS\\s*=\(.*\);CFLAGS = ${CFLAGS} \1;" \;
-	# Custom LDFLAGS for chat, pppoe-discovery and pppdump
-	sed -i chat/Makefile.linux \
-		-e "s;-o chat ;${LDFLAGS} -o chat ;"
-	sed -i pppd/plugins/rp-pppoe/Makefile.linux \
-		-e "s;-o pppoe-discovery ;${LDFLAGS} -o pppoe-discovery ;"
-	sed -i pppdump/Makefile.linux \
-		-e "s;-o pppdump ;${LDFLAGS} -o pppdump ;"
-	# Enable active filter
-	sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux
-	# Enable ipv6 support
-	sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux
-	# Enable Microsoft Proprietary Callback Control Protocol
-	sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
-
-	./configure ${configure_args}
+	./configure --cc="${CC}" --cflags="${CFLAGS}"
 }
 
 do_build() {
-	make COPTS="${CFLAGS} ${LDFLAGS}" ${makejobs}
+	make LDFLAGS="${LDFLAGS}" CBCP=y ${makejobs}
 }
 
 do_install() {
-	make DESTDIR=${DESTDIR}/usr install
+	make DESTDIR=${DESTDIR}/usr BINDIR=${DESTDIR}/usr/bin install
 
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) vinstall include/net/ppp_defs.h 644 usr/include/net;;
@@ -66,11 +43,6 @@ do_install() {
 
 	chmod 755 ${DESTDIR}/usr/lib/pppd/${version}/*.so
 
-	vmkdir usr/bin
-	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
-	vbin pppd/pppd
-	vbin chat/chat
-
 	vinstall ${FILESDIR}/options 644 etc/ppp
 	vinstall ${FILESDIR}/ip-up 755 etc/ppp
 	vinstall ${FILESDIR}/ip-down 755 etc/ppp
diff --git a/srcpkgs/ppp/version b/srcpkgs/ppp/version
new file mode 100644
index 000000000000..4aca89a87a05
--- /dev/null
+++ b/srcpkgs/ppp/version
@@ -0,0 +1 @@
+pattern="ppp \K[\d\.]+"

From a7a0240b64b2107b4f8e9e914eafae3ddae66810 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 9 Mar 2021 02:44:09 +1100
Subject: [PATCH 032/305] NetworkManager: revbump for ppp

---
 srcpkgs/NetworkManager/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e482bba98de7..d439d8b10286 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -3,7 +3,7 @@
 # patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
 version=1.22.10
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -11,7 +11,7 @@ configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
  -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
- -Dpppd_plugin_dir=/usr/lib/pppd/2.4.7 -Dresolvconf=/usr/bin/resolvconf
+ -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware
  -Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d
  -Ddhcpcd=/usr/bin/dhcpcd -Diptables=/usr/bin/iptables
@@ -36,6 +36,8 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+# TODO: Some tests require network namespaces to run.
+make_check=extended
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 make_dirs="

From 05dd040cde29dc4518e5d2fb8644ffea1149be54 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 9 Mar 2021 02:44:34 +1100
Subject: [PATCH 033/305] NetworkManager-l2tp: revbump for ppp

---
 srcpkgs/NetworkManager-l2tp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 51e24d1465ee..55715e71eac3 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"

From 76f850e1b42d20f08f8cf176e8c88036e2d04ae8 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 9 Mar 2021 02:44:51 +1100
Subject: [PATCH 034/305] NetworkManager-pptp: revbump for ppp

---
 srcpkgs/NetworkManager-pptp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 09568b2cec06..22028d520886 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"

From 7403127869658a3db483335f2a5ab62ea5f01e1d Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 16 Mar 2021 15:23:00 +1100
Subject: [PATCH 035/305] libnpupnp: update to 4.1.1

---
 srcpkgs/libnpupnp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template
index f17831094153..62df18fd7ebe 100644
--- a/srcpkgs/libnpupnp/template
+++ b/srcpkgs/libnpupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libnpupnp'
 pkgname=libnpupnp
-version=4.0.14
+version=4.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="BSD-3-Clause"
 homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz"
-checksum=ea5f5bf388bf8c028a25630c58e9a42762fddd357e7e2581b192856e01aad044
+checksum=7e41d3933b956073b33c6ac6e61c81e83b428015ee871fd16d18b198bf3be960
 
 post_install() {
 	vlicense COPYING

From 758fdaa4ff567fe7234ae8065783abfee3d12b48 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 16 Mar 2021 15:24:44 +1100
Subject: [PATCH 036/305] libupnpp: update to 0.21.0

---
 common/shlibs             | 2 +-
 srcpkgs/libupnpp/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bba9a0eb1939..6815daac2265 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1449,7 +1449,7 @@ libgpaste.so.13 libgpaste-3.38.2_1
 libthreadutil.so.6 libupnp-1.6.18_1
 libupnp.so.17 libupnp-1.14.0_1
 libixml.so.11 libupnp-1.14.0_1
-libupnpp.so.9 libupnpp-0.18.0_1
+libupnpp.so.11 libupnpp-0.21.0_1
 libgeocode-glib.so.0 geocode-glib-3.10.0_1
 libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
 libpotrace.so.0 libpotrace-1.11_1
diff --git a/srcpkgs/libupnpp/template b/srcpkgs/libupnpp/template
index 92cbb9bb1dd7..96592395c455 100644
--- a/srcpkgs/libupnpp/template
+++ b/srcpkgs/libupnpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libupnpp'
 pkgname=libupnpp
-version=0.20.2
+version=0.21.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-${version}.tar.gz"
-checksum=48c2cc7b5a3eef55f4dddda88d8676ed11f7e88f1d6680c8458512067a0e0a11
+checksum=e43dbe5020ed25152aaec71b325dd80498e72038da5aeb50ed7dd51e213cd903
 
 libupnpp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -18,6 +18,7 @@ libupnpp-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

From 7ea744b00c197b7fab55d4556969c6e1c493a2fb Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 16 Mar 2021 15:25:18 +1100
Subject: [PATCH 037/305] upmpdcli: update to 1.5.11

---
 srcpkgs/upmpdcli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index 85697c999688..9aebe7b1e683 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,6 +1,6 @@
 # Template file for 'upmpdcli'
 pkgname=upmpdcli
-version=1.5.9
+version=1.5.11
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config tar"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=9fda0b59db8a8b4f283333a89dcca19d70fb8820286d3d071b7c80de38eb7116
+checksum=7c8c6ab866114699405223c60457448dcce35fc13e1e374f68b60eefc55f4f04
 python_version=3
 
 system_accounts="_upmpdcli"

From 2de52799c2c35a26a86c31705f90da2bb41392f6 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Wed, 17 Mar 2021 08:31:25 +0000
Subject: [PATCH 038/305] gnome-online-accounts: update to 3.38.1.

Closes: #29527 [via git-merge-pr]
---
 srcpkgs/gnome-online-accounts/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 6c95c1530c3d..40c8f777d511 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -19,8 +19,9 @@ short_desc="GNOME service to access online accounts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3760ea78729b3038dda0c416b57bc2cbaafcc619eec6c5109654d747fad2418c
+checksum=e18889d67806da84d1261bfed1cf61d2baec131d2d0d0a92f83ff33d4649358e
 
 build_options="gir"
 build_options_default="gir"

From efce7e95734eebe385bc34596f4f67a1eac88270 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Wed, 17 Mar 2021 08:13:25 +0000
Subject: [PATCH 039/305] gnome-podcasts: update to 0.4.9.

Closes: #29525 [via git-merge-pr]
---
 srcpkgs/gnome-podcasts/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index 8f104462ae56..a48eed2afb15 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,19 +1,20 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
-version=0.4.8
-revision=2
+version=0.4.9
+revision=1
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy1-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Podcasts"
+changelog="https://gitlab.gnome.org/World/podcasts/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.gnome.org/World/podcasts/-/archive/${version}/podcasts-${version}.tar.gz"
-checksum=f29c0057dfcdd6ab1745533cc6826f07adddbe3b5b9aad2757421d1259b8303c
+checksum=49a2e48079c84697fe7e1a375a4e15d8687ab6c533488093186f08b7875b1a22
 
 export GETTEXT_BIN_DIR=/usr/bin
 export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext"

From 2fc3d2a53d1203dec75d8ef19a34415435f8cbd9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 14 Mar 2021 13:20:51 -0400
Subject: [PATCH 040/305] runit-void: update to 20210314.

Closes: #29462 [via git-merge-pr]
---
 srcpkgs/runit-void/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index c495a45a3def..2ac215c253f1 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,6 +1,6 @@
 # Template file for 'runit-void'
 pkgname=runit-void
-version=20200720
+version=20210314
 revision=1
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="CC0-1.0"
 homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
-checksum=706ed491315bd75b4b4ca07bc04af97369f8ef8820e9fa1931dae6939ea2e2db
+checksum=9ac95a14b5e1aedfcf0b093b8992b08316448ac1afb7fd26501ac43c4ebf3847
 
 depends="virtual?awk procps-ng runit"
 conf_files="

From 4b808e9bea9705410f37dd5cc0dd8be869a7ecdd Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 04:53:35 +0300
Subject: [PATCH 041/305] element-desktop: update to 1.7.23

Use the right python dependency
---
 srcpkgs/element-desktop/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index aecc89faee79..8bbce9c1866e 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,10 +1,10 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.22
+version=1.7.23
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
-hostmakedepends="git yarn nodejs rust cargo python curl
+hostmakedepends="git yarn nodejs rust cargo python3 curl
  sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
  app-builder"
 makedepends="libsecret-devel"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="890e4028721101d9a3ea4f2fbe892230e0fd2e2995dcc3e0cc560565aec783e1
- d8119916d7a1cc20541f3f236ee19f2117049d328c286c54ac58fbd0fd72db1a"
+checksum="91ca363b9cbb99eee16de4270c03396ac316b42902eef5f01fadabcb864c49ea
+ f8e0e7147cbe77f3ece7bb3a419645f3e2e4f6e59905c93a1be5d352655a3f78"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 4663c0b44222a01106a69e873b00ee6adff9c0d2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 17 Mar 2021 14:47:53 +0100
Subject: [PATCH 042/305] janet: update to 1.15.4.

---
 srcpkgs/janet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index bf4e50ac6e81..4cd9ddacf2e2 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.15.3
+version=1.15.4
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://janet-lang.org/"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=a92d8540f422eb690fa1634e01cd18b4a2a3d184f7d3f219bf4a77c3a655baae
+checksum=8eed302c8ded1df882544d13ce7e415b213cf7bc8fa77ca16110c89b36d19763
 
 post_install() {
 	vlicense LICENSE

From a0ab45188a824d3d7214c649550e5391331be776 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 12 Mar 2021 06:54:57 +1100
Subject: [PATCH 043/305] bitcoin: update to 0.21.0.

- fix cross build
---
 srcpkgs/bitcoin/patches/qt5.15.patch | 10 -------
 srcpkgs/bitcoin/template             | 42 +++++++++++++++++-----------
 2 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/bitcoin/patches/qt5.15.patch

diff --git a/srcpkgs/bitcoin/patches/qt5.15.patch b/srcpkgs/bitcoin/patches/qt5.15.patch
deleted file mode 100644
index adfe36047170..000000000000
--- a/srcpkgs/bitcoin/patches/qt5.15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/qt/trafficgraphwidget.cpp	2020-03-04 13:13:02.000000000 +0100
-+++ -	2020-07-02 17:58:16.576242713 +0200
-@@ -6,6 +6,7 @@
- #include <qt/trafficgraphwidget.h>
- #include <qt/clientmodel.h>
- 
-+#include <QPainterPath>
- #include <QPainter>
- #include <QColor>
- #include <QTimer>
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 3506a68aaeb2..ed8800a1471a 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,39 +1,49 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
-version=0.19.1
-revision=4
+version=0.21.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
- --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config yasm"
-makedepends="db-devel boost-devel miniupnpc-devel
- libevent-devel qrencode-devel libatomic-devel"
+ --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
+hostmakedepends="automake libtool pkg-config yasm"
+makedepends="db-devel boost-devel miniupnpc-devel qt5-tools-devel
+ libevent-devel qrencode-devel libatomic-devel sqlite-devel"
 short_desc="Bitcoin is a peer-to-peer network based digital currency"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://bitcoin.org/"
 distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz
- https://raw.github.com/bitcoin-core/packaging/master/debian/bitcoin-qt.desktop
- https://raw.github.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"
-checksum="f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0
+ https://raw.githubusercontent.com/bitcoin-core/packaging/${version%.*}/debian/bitcoin-qt.desktop
+ https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"
+checksum="1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37
  0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632
  ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722"
 conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0
 skip_extraction="bitcoin-qt.desktop bitcoin128.png"
-subpackages="bitcoin-devel"
 
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX -qt subpkg
-	makedepends+=" qt5-devel qt5-tools-devel"
-	configure_args+=" --with-gui"
-	subpackages+=" bitcoin-qt"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-host-tools"
 fi
 
+pre_configure() {
+	autoreconf -fi
+	case "$XBPS_TARGET_MACHINE" in
+	aarch64*)
+		CFLAGS=${CFLAGS/armv8-a/armv8-a+crc+crypto}
+		CXXFLAGS=${CXXFLAGS/armv8-a/armv8-a+crc+crypto}
+		;;
+	esac
+}
+
+pre_build() {
+	export BITCOIN_GENBUILD_NO_GIT=1
+}
+
 post_install() {
 	rm "${DESTDIR}"/usr/bin/{test,bench}_bitcoin
 
 	for b in bitcoind bitcoin-cli bitcoin-tx; do
-		vinstall contrib/${b}.bash-completion 644 usr/share/bash-completion $b
+		vcompletion contrib/${b}.bash-completion bash $b
 	done
 
 	vlicense COPYING

From 0ecbb7de14147686f9530fe9148c7ea22a3b8457 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 15 Mar 2021 09:52:48 +0100
Subject: [PATCH 044/305] idjc: update to 0.9.1, switch to python3

---
 srcpkgs/idjc/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index cd84568c42af..45cf97545ef7 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -1,19 +1,18 @@
 # Template file for 'idjc'
 pkgname=idjc
-version=0.8.17
-revision=2
+version=0.9.1
+revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config python-devel"
+hostmakedepends="pkg-config git python3-devel"
 makedepends="
  libvorbis-devel libogg-devel jack-devel libsamplerate-devel
  libflac-devel libsndfile-devel mpg123-devel ffmpeg-devel
- speex-devel glib-devel pixman-devel lame-devel pygtk-devel
- libshout-idjc-devel opus-devel twolame-devel mutagen"
-depends="pygtk mutagen desktop-file-utils shared-mime-info python-dbus jack"
-pycompile_module="idjcmonitor.py idjc"
+ speex-devel glib-devel pixman-devel lame-devel python3-gobject-devel
+ libshout-idjc-devel opus-devel twolame-devel python3-mutagen"
+depends="python3-gobject python3-mutagen desktop-file-utils shared-mime-info python3-dbus jack"
 short_desc="Internet DJ Console"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://idjc.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ce0c5517c298cfc7bb8d604c4accf98831ee1ecc2e97108e2f33c0f510ae7d34
+checksum=78106e9d9e82a08269e5ece45c7cbf0a38c3f931d7341df05e7fee002b872224

From ebed4b5a3ce64ba498c6ef3e40fade9bf47cff2f Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Sun, 14 Mar 2021 20:22:52 +0100
Subject: [PATCH 045/305] efibootmgr: fix post-remove kernel hook

Don't attempt to delete nonexistent UEFI entries from previous kernel versions.
Fixes #13133
---
 srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove | 2 +-
 srcpkgs/efibootmgr/template                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove b/srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove
index 310f4e820626..54557e5cb792 100644
--- a/srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove
+++ b/srcpkgs/efibootmgr/files/kernel.d/efibootmgr.post-remove
@@ -18,4 +18,4 @@ major_version=$(echo $PKGNAME | cut -c 6-)
 hexnum=$(efibootmgr | grep "Void Linux with kernel ${major_version}" | cut -c "5-8")
 
 # delete it
-efibootmgr -Bq -b $hexnum
+[ "$hexnum" ] && efibootmgr -Bq -b $hexnum
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index 36a0b6f6bb9d..bd2e88bbbeac 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -1,7 +1,7 @@
 # Template file for 'efibootmgr'
 pkgname=efibootmgr
 version=17
-revision=5
+revision=6
 hostmakedepends="pkg-config"
 makedepends="libefivar-devel popt-devel"
 short_desc="Tool to modify UEFI Firmware Boot Manager Variables"

From aaf01591fd8a25546d24d2ee283a02e6d253cd4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Mar 2021 15:10:25 -0300
Subject: [PATCH 046/305] gdb: fix musl patch.

Use patch from Alpine. __SIGRTMIN and SIGRTMIN aren't the same thing:
SIGRTMIN is for signals applications can use, for which musl currently
returns 35, but __SIGRTMIN is supposed to include the signals that libc
uses, where the correct value is 32.
---
 srcpkgs/gdb/patches/gdb-linux_nat.patch | 21 ---------------------
 srcpkgs/gdb/patches/gdb-signals.patch   | 21 +++++++++++++++++++++
 srcpkgs/gdb/template                    |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/gdb/patches/gdb-linux_nat.patch
 create mode 100644 srcpkgs/gdb/patches/gdb-signals.patch

diff --git a/srcpkgs/gdb/patches/gdb-linux_nat.patch b/srcpkgs/gdb/patches/gdb-linux_nat.patch
deleted file mode 100644
index 53f3132d36cd..000000000000
--- a/srcpkgs/gdb/patches/gdb-linux_nat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-the first chunk fixes build errors,
-the non_stop part below fixes thread debugging being available
-by default without setting any breakpoints or usage of libthread_db.
-
---- gdb-7.4.org/gdb/linux-nat.c	2013-08-10 05:24:24.651000003 +0000
-+++ gdb-7.4/gdb/linux-nat.c	2013-08-10 05:25:50.966000003 +0000
-@@ -71,6 +71,14 @@
- # endif
- #endif /* HAVE_PERSONALITY */
- 
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN SIGRTMIN
-+#endif
-+
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
- /* This comment documents high-level logic of this file.
- 
- Waiting for events in sync mode
diff --git a/srcpkgs/gdb/patches/gdb-signals.patch b/srcpkgs/gdb/patches/gdb-signals.patch
new file mode 100644
index 000000000000..f412e1bc6468
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-signals.patch
@@ -0,0 +1,21 @@
+relevant bug:
+https://sourceware.org/bugzilla/show_bug.cgi?id=23616
+
+diff --git a/gdbsupport/signals.cc b/gdbsupport/signals.cc
+index 485e0f0..ab8d454 100644
+--- a/gdbsupport/signals.cc
++++ b/gdbsupport/signals.cc
+@@ -31,6 +31,13 @@ struct gdbarch;
+    _available_ realtime signal, not the lowest supported; glibc takes
+    several for its own use.  */
+ 
++#ifndef __SIGRTMIN
++# define __SIGRTMIN 32
++#endif
++#ifndef __SIGRTMAX
++# define __SIGRTMAX _NSIG
++#endif
++
+ #ifndef REALTIME_LO
+ # if defined(__SIGRTMIN)
+ #  define REALTIME_LO __SIGRTMIN
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d1030..e63224696bd3 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline

From 08c1fd1f96ccce88732fb349e3ffb0fdf277c50e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Mar 2021 17:49:02 +0200
Subject: [PATCH 047/305] font-awesome5: update to 5.15.3.

---
 srcpkgs/font-awesome5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 24af77fee569..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.2
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=ce8d6225c59c2fedab03658144d896807e58d7d5082da7c9655301a44c5cb3d2
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 

From adb25ecc6ff71c2beb08922d713ad97346e010b4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Mar 2021 18:00:31 +0200
Subject: [PATCH 048/305] mtpaint: update to 3.50.08.

---
 srcpkgs/mtpaint/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index 4b8174adf027..dd64ea47d727 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50.07
+version=3.50.08
 revision=1
-_commit=da57515755c9f44182e31eb316869f890c0db817
+_commit=4ea607e44f7fe9373d399f56d59e048d62034619
 wrksrc="mtPaint-${_commit}"
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://mtpaint.sourceforge.net/"
 changelog="https://raw.githubusercontent.com/wjaguar/mtPaint/master/NEWS"
 distfiles="https://github.com/wjaguar/mtPaint/archive/${_commit}.tar.gz"
-checksum=a2c37fd7b44ffbb455c0cd5c5616273829c315e5143d044c750807bdcf8971dc
+checksum=1d482e493b7ff27677168952192fc2663357fa408f1a98893c0c07d4a2604c06
 
 post_install() {
 	vdoc doc/vcode.t2t

From d189c0c6ac1c4d62cf195bc3e1db40f8a52b392a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 15 Mar 2021 15:02:43 +0100
Subject: [PATCH 049/305] yad: update to 9.1.

---
 srcpkgs/yad/patches/tools.c.patch | 11 +++++++++++
 srcpkgs/yad/template              |  5 ++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/yad/patches/tools.c.patch

diff --git a/srcpkgs/yad/patches/tools.c.patch b/srcpkgs/yad/patches/tools.c.patch
new file mode 100644
index 000000000000..a0b9e9676db9
--- /dev/null
+++ b/srcpkgs/yad/patches/tools.c.patch
@@ -0,0 +1,11 @@
+--- src/tools.c	2021-03-15 15:19:06.650948813 +0100
++++ src/tools.c.new	2021-03-15 15:14:18.580955373 +0100
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include <config.h>
+-
++#include <locale.h>
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ 
diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 332804d9a441..9e16e76f7a73 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=8.0
+version=9.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-icon-browser"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/v1cont/yad"
 changelog="https://raw.githubusercontent.com/v1cont/yad/master/NEWS"
 distfiles="https://github.com/v1cont/yad/releases/download/v${version}/yad-${version}.tar.xz"
-checksum=5c9538b7f242de715249e9f7d30108c0706d23219b5b1bb85cfead6ae77abff3
+checksum=288142d338c055d3839083d8146c6f270bd5a17f78ff9cd2a3c41a8cf31a0e92
 
 pre_configure() {
 	autoreconf -ivf
@@ -22,5 +22,4 @@ pre_configure() {
 post_install() {
 	# Avoid conflict with disputils
 	mv "${DESTDIR}"/usr/bin/{,yad-}pfd
-	mv "${DESTDIR}"/usr/share/man/man1/{,yad-}pfd.1
 }

From 314bc70df8fc215e0566dcbf7d77cede5d22b33d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 17:51:58 +0300
Subject: [PATCH 050/305] font-sarasa-gothic: update to 0.18.7

---
 srcpkgs/font-sarasa-gothic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 91f6ca8b3ec2..be4e1b3edd1f 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.18.5
+version=0.18.7
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=a114a3241e4ccfd5608f772093ed0c17d25218cd04344b15d5f48159d4baa7fb
+checksum=73d12b2ecbcb4c4d2417f3e169d84fc11882b7711e9ef2c75b31cb1d0bc550bb
 
 font_dirs="/usr/share/fonts/TTF"
 

From 8741d96e26b0f16d0235cb872905cf61904e5bda Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 17:55:27 +0300
Subject: [PATCH 051/305] font-iosevka: update to 5.0.8

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 9d415425f060..eb1e44c521b8 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=5.0.5
+version=5.0.8
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -12,8 +12,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 18c598daca7e041754bbb88777868ba438375c6c76883a3ca2bab2d635406abb
- cec5a0ba8d5edd4852b794df2da54ff2f74f8b718d7cd37f3189a53b021d954a"
+ dc8f7cb92676949ffd5c46d09d4ee0e73e0538844c2198f3b5fee0216545cc35
+ b3565ce3f8e876274c32ef6d776f1b7d60dba99257afb812e2405d140314823b"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 56eed967592af02a4f99ba9bd062fd2b923129ba Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Mar 2021 18:45:18 +0200
Subject: [PATCH 052/305] xfce4-time-out-plugin: update to 1.1.2.

---
 srcpkgs/xfce4-time-out-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 2a7e7089ab2e..55da8c0ea8d5 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
-version=1.1.1
-revision=2
+version=1.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=194dbeb8751d8aaedf3850a7a9c770f09d32316a99683cde34d7d0fc5bdba31d
+checksum=3dd8eba694ff3ba5c25bd7f5cd70dc22175fb2c0a759213f05ab8f0e629d82d4

From 209a267d9b72b8784f234317bb2a3f9b417cebb3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Mar 2021 18:25:34 +0200
Subject: [PATCH 053/305] xfce4-systemload-plugin: update to 1.3.0.

---
 srcpkgs/xfce4-systemload-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 269ef5374d7e..e05885f61210 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=0531b8df923cba3be8d064cb8b638b954df74915e5a447228999517847789835
+checksum=1148f8e90cc53cae9b3aa32e10df4bd9fdc2f06db09d8429f88fbdd874fc171d
 
 post_install() {
 	vlicense COPYING

From 91f47ac08ec66a5172f7d530225c2120521efc28 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Mar 2021 18:16:06 +0200
Subject: [PATCH 054/305] xfce4-netload-plugin: update to 1.4.0.

---
 srcpkgs/xfce4-netload-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6bc9cfb3affb..de056c06c519 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
-version=1.3.2
-revision=3
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=22e40425cfe1e07b01fe275b1afddc7c788af34d9c2c7e2842166963cb41215d
+checksum=6c76260e101790754dd93255ec979accd97d21a21da85d8edcd6c7b01ddcd70c

From 257a660f16baa0acaaf4b80e33f6850cd4cca790 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 17 Mar 2021 12:13:19 -0400
Subject: [PATCH 055/305] Revert "occt: update to 7.5.0."

OCCT 7.5.0 breaks ABI, and downstream packages such as FreeCAD fail to
build.

Keep the license change. We should also stick with their repository
instead of GitHub, which doesn't have all the releases.

This reverts commit abe75dc062e4353618830b563b0ae0596d0606ad.

Closes: #29541 [via git-merge-pr]
---
 srcpkgs/occt/patches/fix-cmake-regex.patch |  2 +-
 srcpkgs/occt/patches/musl-fenv.patch       |  4 ++--
 srcpkgs/occt/patches/musl-mallinfo.patch   | 23 +++++++++++-----------
 srcpkgs/occt/template                      | 15 ++++++++------
 srcpkgs/occt/update                        |  2 ++
 5 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/occt/update

diff --git a/srcpkgs/occt/patches/fix-cmake-regex.patch b/srcpkgs/occt/patches/fix-cmake-regex.patch
index 6d2ca83463da..4742ed9f2e7f 100644
--- a/srcpkgs/occt/patches/fix-cmake-regex.patch
+++ b/srcpkgs/occt/patches/fix-cmake-regex.patch
@@ -3,7 +3,7 @@
 
 --- adm/templates/OpenCASCADEConfig.cmake.in	2019-01-27 00:18:42.763819658 -0500
 +++ adm/templates/OpenCASCADEConfig.cmake.in	2019-01-27 23:40:32.872489521 -0500
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,7 @@
  if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
    get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
  endif()
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 1720d12ce298..c4fd770646db 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -11,8 +11,8 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
  
  #include <signal.h>
  
--#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
-+#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
+-#if !defined(__ANDROID__) && !defined(__QNX__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && defined(__GLIBC__)
    #include <sys/signal.h>
  #endif
  
diff --git a/srcpkgs/occt/patches/musl-mallinfo.patch b/srcpkgs/occt/patches/musl-mallinfo.patch
index 632ca3f04ca9..3561c31f05a9 100644
--- a/srcpkgs/occt/patches/musl-mallinfo.patch
+++ b/srcpkgs/occt/patches/musl-mallinfo.patch
@@ -2,17 +2,16 @@ In musl libc there is no struct mallinfo and no function mallinf()
 
 --- src/OSD/OSD_MemInfo.cxx.orig
 +++ src/OSD/OSD_MemInfo.cxx
-
-@@ -182,8 +182,12 @@
- #elif (defined(__linux__) || defined(__linux))
-   if (IsActive (MemHeapUsage))
-   {
-+    #if defined(__GLIBC__)
-     const struct mallinfo aMI = mallinfo();
-     myCounters[MemHeapUsage] = aMI.uordblks;
-+    #else /* XXX not yet coded */
-+    myCounters[MemHeapUsage] = 0;
-+    #endif
+@@ -147,8 +147,12 @@
    }
+   aFile.close();
+ 
++  #if defined(__GLIBC__)
+   struct mallinfo aMI = mallinfo();
+   myCounters[MemHeapUsage] = aMI.uordblks;
++  #else /* XXX not yet coded */
++  myCounters[MemHeapUsage] = 0;
++  #endif
  
-   if (!IsActive (MemVirtual)
+ #elif (defined(__APPLE__))
+   struct task_basic_info aTaskInfo;
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index cc240b6f5e43..9298edc76e08 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,9 +1,10 @@
 # Template file for 'occt'
 pkgname=occt
-version=7.5.0
-revision=1
-_ver="${version//./_}"
-wrksrc=OCCT-${_ver}
+reverts=7.5.0_1
+version=7.4.0p1
+revision=3
+_gittag="V${version//./_}"
+wrksrc=occt-${_gittag}
 build_style=cmake
 configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
  -DINSTALL_SAMPLES=ON"
@@ -13,8 +14,10 @@ short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:LGPL-2.1-only-with-exceptions"
 homepage="https://www.opencascade.com"
-distfiles="https://github.com/Open-Cascade-SAS/OCCT/archive/V${_ver}.tar.gz"
-checksum=dbe1d62a9317ad1516bd4575293d9aab2dc20206ca7a60a7705c9a3b77dc59c9
+# distfile: use git instead of official tarball, which requires registration
+# see https://www.opencascade.com/content/packaging-again-debian
+distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
+checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
 conflicts="oce>=0"
 
 post_install() {
diff --git a/srcpkgs/occt/update b/srcpkgs/occt/update
new file mode 100644
index 000000000000..c128eec6d9c9
--- /dev/null
+++ b/srcpkgs/occt/update
@@ -0,0 +1,2 @@
+site="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=tags"
+pattern=">V\K[\d_p]+(?=</a>)"

From 211cd2c2d9ca71cfbf172d1eeeb51fd76fb10685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 17 Mar 2021 18:36:13 +0100
Subject: [PATCH 056/305] croc: update to 8.6.11.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 52b3b5d6f4ca..4eaef4d70405 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=8.6.10
+version=8.6.11
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=3d3ecb85e985013b4494225eefffbec0eecdda236ecaccb287e2cc7bc32d2cf7
+checksum=31df18c9fc38a26aeeab0d12e57f34feba602a3ce6f4a5a0474b46a50df3b459
 
 post_install() {
 	vlicense LICENSE

From 5e8a8344b8186abf6fe98433d724cee328448fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 17 Mar 2021 18:58:25 +0100
Subject: [PATCH 057/305] exiftool: update to 12.22.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 0e33eea8298e..d90e9d91c6af 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.21
+version=12.22
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=9ae43d60abf4fab0b7b11f7df4a1fae383613554d1abce2e6e5e5a49c3e62f21
+checksum=8c913623b9007e9cf18f15a43d31a05459dbdb9aa5daaef8201eaec753fe5a6d

From 050c656c762700e7150957fe0f8cd56404b915a8 Mon Sep 17 00:00:00 2001
From: TC <git@titouan.co>
Date: Wed, 17 Mar 2021 20:01:42 +0100
Subject: [PATCH 058/305] lazygit: update to 0.26.1.

---
 srcpkgs/lazygit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 4bda24e4a08c..3caebf1d10f2 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.25.1
+version=0.26.1
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=4de157c0997a12d9161bc0c10cb65053349325f2da9005bd271361a2bee8074b
+checksum=7bfda18345993206d4d388ea0370e9b54af0354d37f4a64803461889b361d547
 
 post_install() {
 	vlicense LICENSE

From fdff5e282b85fd41d5a604136181f672fcbe9946 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 12 Mar 2021 19:15:24 +0100
Subject: [PATCH 059/305] font-unifont-bdf: update to 13.0.06.

---
 srcpkgs/font-unifont-bdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index 6f65dba0bad4..48b901e1951a 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-unifont-bdf'
 pkgname=font-unifont-bdf
-version=13.0.05
+version=13.0.06
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://unifoundry.com/unifont/index.html"
 distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz"
-checksum=c4e61e9336d8d024479ea72616722c6c47c93f76dc173e8ad3edf9f9e07c3115
+checksum=b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5
 font_dirs=/usr/share/fonts/misc
 
 do_install() {

From 8b2bde5d7c79cbd451784234188c1cef168152b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 18 Mar 2021 07:21:19 +0700
Subject: [PATCH 060/305] libogdf: distfiles moved, cleanup

New release v2020.02 is available.
---
 .../patches/no-march-native-werror.patch      | 25 +++++++++++++++++++
 srcpkgs/libogdf/template                      | 19 ++++++--------
 2 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/libogdf/patches/no-march-native-werror.patch

diff --git a/srcpkgs/libogdf/patches/no-march-native-werror.patch b/srcpkgs/libogdf/patches/no-march-native-werror.patch
new file mode 100644
index 000000000000..bee7c0a475fb
--- /dev/null
+++ b/srcpkgs/libogdf/patches/no-march-native-werror.patch
@@ -0,0 +1,25 @@
+Index: b/cmake/compiler-specifics.cmake
+===================================================================
+--- a/cmake/compiler-specifics.cmake
++++ b/cmake/compiler-specifics.cmake
+@@ -12,12 +12,6 @@ if(MSVC)
+   set(COIN_LIBRARY_TYPE STATIC)
+ endif()
+ 
+-# use native arch (ie, activate things like SSE)
+-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+-  # cannot use add_definitions() here because it does not work with check-sse3.cmake
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+-endif()
+-
+ # set default warning flags for OGDF and tests
+ set(available_default_warning_flags "")
+ set(available_default_warning_flags_debug "")
+@@ -38,7 +32,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Cl
+     set(available_default_warning_flags_release "-Wno-error=unused-but-set-variable -Wno-error=strict-overflow")
+   endif()
+   set(available_default_warning_flags_release "${available_default_warning_flags_release} -Wno-error=unused-variable")
+-  set(warnings_as_errors_flag "-Werror")
+ elseif(MSVC)
+   set(available_default_warning_flags "/W3 /wd4018 /wd4068 /wd4101 /wd4244 /wd4250 /wd4267 /wd4373 /wd4800 /wd4996")
+   # this has to be explained because MSVC is so cryptic:
diff --git a/srcpkgs/libogdf/template b/srcpkgs/libogdf/template
index d9bcdd886a0b..5ca0549acc51 100644
--- a/srcpkgs/libogdf/template
+++ b/srcpkgs/libogdf/template
@@ -5,26 +5,21 @@ revision=1
 archs="i686* x86_64*"
 wrksrc=OGDF-snapshot
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON -DOGDF_EXTRA_CXX_FLAGS=-Wno-error"
+configure_args="-DBUILD_SHARED_LIBS=ON"
 hostmakedepends="unzip python"
 makedepends="libClp-devel"
 short_desc="Open Graph Drawing Framework"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://www.ogdf.net"
-distfiles="http://amber-v7.cs.tu-dortmund.de/lib/exe/fetch.php/tech:ogdf-snapshot-${version//./-}.zip"
+homepage="https://ogdf.uos.de/"
+distfiles="https://ogdf.uos.de/wp-content/uploads/2019/04/ogdf-snapshot-${version//./-}.zip"
 checksum=347c3fa8dcdbb094f9c43008cbc2934bc5a64a532af4d3fe360a5fa54488440f
 nocross="can't find cpuid.h headers"
+patch_args=-Np1
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="Non optional usage of broken mallinfo" ;;
-esac
-
-pre_configure() {
-	# Fix upstream messing with CXXFLAGS
-	sed -e 's|-march=native||g' \
-		-i cmake/compiler-specifics.cmake
-}
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	broken="Non optional usage of broken mallinfo"
+fi
 
 libogdf-devel_package() {
 	short_desc+=" - development files"

From e6467a457c0780721bf81b0f817945ec1961e6ef Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 15 Mar 2021 09:17:09 +0100
Subject: [PATCH 061/305] seaweedfs: update to 2.34.

Closes: #29470 [via git-merge-pr]
---
 srcpkgs/seaweedfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 8954c53c65bf..2935677d54f9 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,6 +1,6 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
-version=2.26
+version=2.34
 revision=1
 build_style=go
 go_import_path="github.com/chrislusf/seaweedfs"
@@ -11,4 +11,4 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/chrislusf/seaweedfs"
 distfiles="https://github.com/chrislusf/seaweedfs/archive/${version}.tar.gz"
-checksum=42a95498bc858ee55e699bc1418a926c8c9a38ae581535f33f683b634feb2e79
+checksum=e268f9b0eb9b9be5be552b98a8482ff1f5630c1e996d46b9b36d3180eef62be7

From 1c552b364e8d91bfb59d5bff654d227f915a6259 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 17 Mar 2021 18:31:34 +0100
Subject: [PATCH 062/305] linux5.10: update to 5.10.24.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 3a480c0a5b00..6d014ade30b8 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.23
+version=5.10.24
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f6e21c03ec6ff85b26d77c59fdab81e64707792a57593643307df192749edb6a
+checksum=c6dcd04e5893c5d68b637188f904528e91f28d790cd49cf8a7fb817423bd763f
 python_version=3
 patch_args="-Np1"
 

From c0f3bb504679c155598cd3a6374cc12635952acb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 18 Mar 2021 09:35:39 +0100
Subject: [PATCH 063/305] sc-im: update to 0.8.0.

---
 srcpkgs/sc-im/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 1ef1fe898a76..1ef52b95e70a 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,7 +1,7 @@
 # Template file for 'sc-im'
 pkgname=sc-im
-version=0.7.0
-revision=4
+version=0.8.0
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
@@ -14,9 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause"
 homepage="https://github.com/andmarti1424/sc-im/"
 distfiles="https://github.com/andmarti1424/${pkgname}/archive/v${version}.tar.gz"
-checksum=87225918cb6f52bbc068ee6b12eaf176c7c55ba9739b29ca08cb9b6699141cad
-
-CFLAGS="-fcommon"
+checksum=ba65b3936a21ae65b19d99a4cfbb69bb57d8b00880f0781fb620e8857bc498db
 
 post_extract() {
 	vsed -i -e 's/lua51/lua5.1/g' \

From d8e54e5d869dc3235dc97644a188312729915bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:15:36 +0100
Subject: [PATCH 064/305] bluedevil: update to 5.21.3.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 666634ed8a86..7bf2a1623e61 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8f0fc7cb133f1d9b5ea4cbb21d7f2e029e5b5184574e46ba5b43c85aae5006a1
+checksum=1b1ff32ed88ff087fe33992aaa56ddfcb03361ad3b17ee09a351ab93ec2215f7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 0ff476ef16824eb5e5752c1ebab245fd09105d32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:15:37 +0100
Subject: [PATCH 065/305] breeze-gtk: update to 5.21.3.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 60ec7d0c48aa..4c1a29faf59b 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=23c6de40348762e2d3c38d72537675891e3d937210341acfad7ae3a034b29d57
+checksum=ac45fe545269a70aba4878fdae306d7c6a621e9f7478981f9c0b3a5a42f2abf4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From e41cc83a97f63b7001d3dc6278a1d2f0349c13e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:15:48 +0100
Subject: [PATCH 066/305] breeze: update to 5.21.3.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 7bc8d4e30e68..ffa237717f46 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=641cf3613d939b37437bac0e3caa1f25171ed2b4adf8e4037a0fd0dbb1b1146d
+checksum=838ad341c16a32331574d6c2588c48cba54033dd95ff33e56f17d880911b353b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 8321ba6ec96439a87ae61d190dcd2fcb041c76d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:15:50 +0100
Subject: [PATCH 067/305] kactivitymanagerd: update to 5.21.3.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 1e40340632d4..415e0b49b766 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=92aa23f36751bb24b00ef0e818783f997437b15c7589074adc6bb962e3559a15
+checksum=83a1241edd4b3fb50545eb62d4dd2a73bfb8367d71e65af2017f26275736b7f4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUN_RESULT_VAR=0"

From b571b4f2e015590e3322b6247e85a429e009733d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:15:51 +0100
Subject: [PATCH 068/305] kde-cli-tools: update to 5.21.3.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1faa2a11dd55..09b6911bb35d 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=07bc872cf78f8f3e45e22b8bd1413a5d37a8c9ab9b4d255c1a3ebb46618dfc10
+checksum=f72ed4e939a85fc1643784f2fe413b743f3e9f8ce7c8a7ef0dd792d7ffc87542
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 52c579db23d54a0d4658813e1ba823fbcf30a608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:15:53 +0100
Subject: [PATCH 069/305] kde-gtk-config5: update to 5.21.3.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 7168490e3408..9ec0d55ae6cf 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.21.2
+version=5.21.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c1721bde6a160a196a53475d5c193d02c0a928a5ec47a04d7333907a74e6470f
+checksum=30e88dded1de4f5d096afa20c6ce148da800123c5e8318e44c0540258555de9d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 8ef2f2213262d288f749034d77b6a9bd8c8b4ae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:15:55 +0100
Subject: [PATCH 070/305] kdecoration: update to 5.21.3.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 6ecf190a4d50..766d5be82542 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=31b07c0c53ce84370e3c74eaa92caffc7148bc17864f1a9d8ac5b8c32cfa795e
+checksum=c5d14b8dd6983f22cbf4d34461e912fd38cd49114d01fb25635d7a1a9c7e4319
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 8ce9fe17413fb89f290a90c372708b7ba844f4dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:15:57 +0100
Subject: [PATCH 071/305] kdeplasma-addons5: update to 5.21.3.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index ba7eeb2b0e7f..97107c364012 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.21.2
+version=5.21.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=237ebfce30f84ff5612d5b42bc6d8229032f81c0e392cbd8a4f1f31260c79938
+checksum=6121ed8b1ad433cdb531aaf8658b41f4b4744c869bae72c109c46a6652570185
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 50b29d7c9ec98cd52a5bc02de94aa5818231fb30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:15:58 +0100
Subject: [PATCH 072/305] kgamma5: update to 5.21.3.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index b3bab26e243e..be38eb87607a 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d1c5fdf27408f43faa2ab6e18cda373860c4fce8e13dd213d9b4fb7aaf32d832
+checksum=892c0cf1cc988c8291da4ef080d70df3211920a5dbe99275afdf796a1ae71941
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From 96233b3beb6e207720183fa6d0f44e16ce74dc3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:01 +0100
Subject: [PATCH 073/305] khotkeys: update to 5.21.3.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 7124df3b24a4..cf1bd1f18060 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8ea1394e3c2cee173420b7d7e14dbf92bce2a780504b4f60b91be33728279f41
+checksum=74051ad637ab49bab81391f8789253e1e0e275a0aa7971ca553dff5a56866ad8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 381d3ee8b61f4d616c9d9ee4dbb0d45de26bba5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:03 +0100
Subject: [PATCH 074/305] kinfocenter: update to 5.21.3.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 6839ed75a23e..18ffe7fad1c1 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=353a1c960cd01a17378de19796879e910c223b1f2b07611962ac34118a35d09c
+checksum=e2cc48fdd873a16baea5e8b8c20e1e97a5c14acfae00458ff261f52abaad44c2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 3942f89c18ab0c681876881934e76c569573c5d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:05 +0100
Subject: [PATCH 075/305] kmenuedit: update to 5.21.3.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index b5b397d98da8..4eeb1f4c3a1e 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5aa28e095ae2cca278f27c5d9931d758f6857fa6462dafb0f27ef507d417b53f
+checksum=524aeb87739b0320bcd38551b367cff017c26a830669de7c91aaaa10a8d28339

From 557cf7a857c3b5ece34946afd8cdf065bc2659e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:07 +0100
Subject: [PATCH 076/305] kscreen: update to 5.21.3.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 9d46a598efcc..67a24dfa2291 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=beeba77f91183e460c7d9d58d2b3769951681dae4d096571577aa5cc8b362104
+checksum=95e20c0967c1dcb5521dddcd6444f3a51a8b6ab5a1bd1e586d6d202469eb2fb9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From e40c9d3052bb9ce8f23990597bb410894cabcb48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:08 +0100
Subject: [PATCH 077/305] kscreenlocker: update to 5.21.3.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 1bc5b4e52fa2..ef8a40bd507f 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f9a63a2dcc3d540fd45484618424366ded4568ccadad93b80b6c42740af171f0
+checksum=0012c4f0394bc6cd522a8fc4ed78f02e641b55d1baf8a81f6fd926c538bf54c2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 26c477c2300066dc93424538efdc3e5fc051e6dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:10 +0100
Subject: [PATCH 078/305] ksshaskpass: update to 5.21.3.

---
 srcpkgs/ksshaskpass/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 7d11c4d32500..c249a0801ccf 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,7 +1,7 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.21.2
-revision=2
+version=5.21.3
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-devel kdoctools qt5-qmake
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=85527240fe0a2dd7da5e89740678b473b36f14959b201cddd50ef3c0890dd2fd
+checksum=da0e1b06673afb12789fd028f2d428d980b85912ceb5e715bc710f5edb9f8299
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From b1b71c878629e6351f04541f8803939faf83eeeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:12 +0100
Subject: [PATCH 079/305] ksysguard: update to 5.21.3.

---
 srcpkgs/ksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index c0be0150ad1e..1c789b769e57 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=547e32d87c32f6c883ebb08a54486d49ad9d87185bae8f82c82fef95b4e028d2
+checksum=4ee3595e30a932846dd2ad668231c2fdc7086135ba51d83e3bc6a685658b417b

From 7f50231e50a6fd82a2cca9bf6cb523fecadd10cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:14 +0100
Subject: [PATCH 080/305] kwallet-pam: update to 5.21.3.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 06333753441c..eb983c580742 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=864717b9082e83bf93f0d9fbf8c31adf31c64af2fc4729cbaf67982fba93ff8b
+checksum=4372d688ccc5e996e8bc1683939786f40dce3f21113067a5ab21f84ca688d6b6

From 49342c5ebef7107c183a493629520d17f0fe5836 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:15 +0100
Subject: [PATCH 081/305] kwayland-integration: update to 5.21.3.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 4fe216d403bd..2e776bae0067 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6046514b84c4a1905a43fb7c3482c8fdbd1eb0f55efdd79a2a827073639086bb
+checksum=0c7641e27a38094077a204ca10c410b2f4f92c0a077b32a22bb5d5ae572b1c4f

From 11edd88d97dbe7b8ce577e664e14887435d8616f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:17 +0100
Subject: [PATCH 082/305] kwayland-server: update to 5.21.3.

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index fa3c00892036..d2f628b980d8 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ea9ba09575ef5fb8368284b327eef2ee77d17c20511a3b7219f9b4e465f6aa3
+checksum=4409119a0e8c6dae5295490f965b26c1160b8df863cce6e46287a5ffe9d26a34
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 14dcd0fdbb09b09f97d2a330f2391d30bbc36d5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:22 +0100
Subject: [PATCH 083/305] kwin: update to 5.21.3.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index a6b51fb9edc1..b0959c40f5eb 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14896e98e5600eba7c3aa7f18168bec697ba1670c012a560b33302075bb0465a
+checksum=7c38049930f63875719c4405991c13ab436d2a2d2ad401b006e94250dd8d205a
 patch_args=-Np1
 
 build_options="pipewire"

From f58ffccae24071936a5a134a3880f5522fd19e9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:23 +0100
Subject: [PATCH 084/305] kwrited: update to 5.21.3.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 4f9701117bb5..2ae02d6ae5be 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=afed5c80700cfae4db18b22ddfdefeaaf72fe21f85188b2003b691dc94a211d0
+checksum=ddccbb23c1ce510efc4f84cf4a59fc1aaa7f344e8d24b35b4603a3583149d606

From 75986812d9a1fb354c764c8d23408c19be926065 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:25 +0100
Subject: [PATCH 085/305] libkscreen: update to 5.21.3.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index a3c0e472dd36..ca36af1d0663 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21393c76b1646303d4b550538e9b3b7b044e9c1a605cfabde780e931bbe4a70d
+checksum=6a6809a3db3a8c0b86869eae8df37b80ad017292dbee9d26077a22626f0f4dc8
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From b36d8863ec789763d20586314d2b9a9a1c924b41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:27 +0100
Subject: [PATCH 086/305] libksysguard: update to 5.21.3.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index caa4d2fdf789..caad37be1ae3 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0306e2556d94e3366b015d8bb5d7430c1fb66269ad7c0fbce1fecb8970649982
+checksum=c35218190c7af1e8cb144fbfdd9b15eb19479aef6e3182596cd2de8efc582742
 
 build_options="webengine"
 

From 5371b6f0b24f24aa96f5f391a5e2e52473f822ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:28 +0100
Subject: [PATCH 087/305] milou: update to 5.21.3.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 57e82555120f..038e8ec75231 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=460acbef68f29335c6938fae9c37fff68ecd634beab4bcdaea6b2cacf05808da
+checksum=ce070712259d601915b327fbf2747d39d3e5b728a24f05e83deed8818e077361
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 4c51bfabe6240c228c3a9aa6162fa2ae12d55f9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:32 +0100
Subject: [PATCH 088/305] oxygen: update to 5.21.3.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 73589dbe8132..fb21143e2008 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=386be06089400f8aa42902a05542faff5e6d9e7e9a7e5f712f180c96272ea57a
+checksum=0afcd178aaaedba660603f1177055db395af4d6693233bf31226ae4a3a0ed29b

From d15303b3e76704c8efc47fdbeee9b0763ac429c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:33 +0100
Subject: [PATCH 089/305] plasma-browser-integration: update to 5.21.3.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 320d32c1850e..b2bd239158d7 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e52eef2933eeaadbec405c9bf2ca16cd03008e517c13ee3705bc31f711085d30
+checksum=deb4e4de2b821942b4d3096f2193d92459bb6b4b6bdedfe80f77efb1a949e9c3
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 523a663a876955f75d686a44104c318a7e4d7b59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:39 +0100
Subject: [PATCH 090/305] plasma-desktop: update to 5.21.3.

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 899d6de22746..816ffbdb3823 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7dfadd6b711d277ebbc40ea8a49c84b39f27b77afe3273f153f8afbecd74782d
+checksum=de4f62f6e4612fd796387825cd755edde4784c0386c0d0552deb3b3c44993e2f
 replaces="user-manager>=0"
 python_version=3
 

From c8e34bd63a7e4086dd29f3a0350e83f8828442e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:41 +0100
Subject: [PATCH 091/305] plasma-disks: update to 5.21.3.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index b8358fce8dc9..b7d780c44811 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=eee1bd40d72f62710aefa7c2909a4b900b1b1a9f47fbf7e48a1b0ee90654f413
+checksum=58850de94434f61925bb579fdf9eff54f66512f6ca42a7cfba5c2ce8ee6d47a1

From f8bf7667c95048695885770db1c865d65b8973c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:43 +0100
Subject: [PATCH 092/305] plasma-firewall: update to 5.21.3.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 996e96359f1b..744f97c1b8e8 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4476eecafbbe0de870fd0da7f079608a7432843ab9609e5e8f172b61a657b695
+checksum=7ca5bda3bdf7dab10726976aca5d838e651dcb0f30deb540623546fea762f52f

From 9f615acf93b8a3fd186b9254bebbdaaaf58ab841 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:44 +0100
Subject: [PATCH 093/305] plasma-integration: update to 5.21.3.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 3c18aba7259f..b40868ba4024 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=34a2745f20cbde4723f87fca2c6640dc1fd2aec6625fbeba12c14986e24a78ed
+checksum=c1e34f98af9e17062cc10897d49b62867a4957f40469bd2ca01cb546a35bb425

From 67dbbd07261563378383a878ef92ac63dbcec2f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:46 +0100
Subject: [PATCH 094/305] plasma-nm: update to 5.21.3.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index 881d58222999..5b3e24414233 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cae80db9fc8d1d050c78210929ff120b3371028f6af79a77d083ddac0fd274e0
+checksum=771c9a4d3f3acdf8c66f7ff1891790c8a7cfa4053500f1e96617b43f4f39fb34
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 79f18aa395270e9c2ca127676e111c1dfc5a29d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:48 +0100
Subject: [PATCH 095/305] plasma-pa: update to 5.21.3.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 53ed8a5c74ad..00d1547388c5 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=dda139d825ef2b45546e23e78a734f95d48fbba7cd5ec00a9ddd5d647475a181
+checksum=77453789506c489b36d8b23ba874834f240daf9c9ea2e60dfa3f735decefe99b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 95a1f746d37e359d0ca85cbeaa36bfd69b79cb6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:50 +0100
Subject: [PATCH 096/305] plasma-sdk: update to 5.21.3.

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index cd127f6e147e..58eb38cd6376 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7c321c3ffc4e27ba16ae752527e21ac005b894dd2deb5329dd30b7bc9409c721
+checksum=9c20dec0545a5d1bb4e362b5778acbf2a1e65dabc7f9c07b9c84a155e4594b2b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 038ca27864f61e3675125834d282a8c7706b40f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:51 +0100
Subject: [PATCH 097/305] plasma-systemmonitor: update to 5.21.3.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index cfa4111b6a85..3e62a192928d 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4471ea3115e22ee9a16f3281cce05a402cece5aa60f85ee1aa7df4ae2204ab8c
+checksum=941e7a48d8c68ed072848110764e80e3596aea66a6fb99913301cc7f2bfe3df0

From ee83523cffbafcfdba5547586b0c0ad34911c862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:53 +0100
Subject: [PATCH 098/305] plasma-thunderbolt: update to 5.21.3.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index c167d1e3d6b3..5c027622d3e8 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b3b22aa7b1ef1dc7911a64b4191fec46fe3b3f39da3fbe73928144b6dcff7f7
+checksum=b559889b8569ef7d11cd48efac480644fb146dfabaaf147cd7f32d5e6e5a16c8
 
 do_check() {
 	: # Requires running dbus and bolt services

From 87ea86e54eec42b38231a437a4d73b12c9ac7455 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:16:55 +0100
Subject: [PATCH 099/305] plasma-vault: update to 5.21.3.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index ac745e8d5edb..ba43e7b4eaac 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ba1bf86ee7c708a3887ae04ab20e5ef766d71104ebf1e50cac99c5b521dded25
+checksum=323d3d025546524b82b0258e861d5392b65c3f7a7ad9a2c25d98f487bcc1a9e0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 401d53db358c8208c08d1ce6ae5fc8e7bfebe19d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:17:15 +0100
Subject: [PATCH 100/305] plasma-workspace-wallpapers: update to 5.21.3.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 589aa3e8c0a6..e9f0807416b8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8f83fa295e92ad438d33380d784d19f79ef7c223ab26b0105623562fccf5142e
+checksum=95a6e9da0a652e6584f3727227813fe79a9c4defa7d789126a31fceff09853e2

From 4e12e079e9d68c146d7076529ee4f410df44c15f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:17:20 +0100
Subject: [PATCH 101/305] plasma-workspace: update to 5.21.3.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0470d04d6007..15366088e54a 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f3c30b3c51dd9d127ba4086252eebef22a7fe5dd34c7fa19498559ccab73d4cc
+checksum=80602e458ebabbf1685c918485bff4cb30eaae71cfd2bf2c4c9cea7a58b74ab6
 
 build_options="pipewire"
 

From 240e0085cca25cb55fff4f464b050a87654e8f3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:17:22 +0100
Subject: [PATCH 102/305] polkit-kde-agent: update to 5.21.3.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 16289005492a..7fc9b2a992d3 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.21.2
+version=5.21.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=4f3b40a866b1b3994cf3b464b7bdad4da10e8c391312dafb1fd5e1c72a7a29fc
+checksum=1b6802f688a8c0e83dc065503447a2e79967c67083799e4896b51813809b171b

From 8323ee7b4c00c438ae5f95f270eee24859cee735 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:17:24 +0100
Subject: [PATCH 103/305] powerdevil: update to 5.21.3.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 2df8c5ca0e69..385648f67dd0 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=55aacf9183171bf9accdf71158940e76ff6cbc71c00eca5a3917cb69efaa371b
+checksum=ffcbc2ca715377e6652f65744601c95ba0babbde7a15d4f4e8a3fa0ad85e6652

From b765590e6fe20a824e7a549fdb177836f91a6763 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:17:26 +0100
Subject: [PATCH 104/305] sddm-kcm: update to 5.21.3.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 8bed10e37c51..e3dbe3ede0ea 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=08a1337fee005d26f29d405d543c6693d28e108e269ec10bb8705da5354abbef
+checksum=5f52bc7dd194f26c9f6fec8a0872026a1eb972fb25cdc0753bda981faf7b98ba

From f73156a4abea98cec68bafe36147ef89bacd64eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:17:27 +0100
Subject: [PATCH 105/305] systemsettings: update to 5.21.3.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 982c22dadf9f..ef8de924cf78 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cd355f1c9438cb5d177e7d8bf228342c6e0b6a3080b0ee479897d55431b788fe
+checksum=1d9518fa792970859d49965209138ee9944a9e1db00ed2eea3337481c4a3d623

From 9c6d3c0c3e5c9bb580c2b5e5896c0aee5621384e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 09:17:29 +0100
Subject: [PATCH 106/305] xdg-desktop-portal-kde: update to 5.21.3.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 301e25a94924..16a4dbf7294a 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.21.2
+version=5.21.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4cf61e4f8d38081d35c8618985db5644128c8a08264304d7c2f2b8ef0c96abe
+checksum=3012df6b6127bf7800b7be1fd8674213d0748e17050862dd13b2ca34f89a2117

From b5c45ab9965c907e5269767f14eddf75066c03c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 11:36:16 +0100
Subject: [PATCH 107/305] kio: update to 5.80.1.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index dc816d4d909a..1b44de646fb5 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.80.0
+version=5.80.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a85fc02cec6ef550d4465e8126ac0a4d9d77c745ab7b05b6b6334a0e54e9775
+checksum=d971ce61a022f9e4d2d6be9c66917be271d0fb212795a151150e208e64cd5a28
 
 CXXFLAGS+=" -fpermissive"
 

From 2afc4727369b75f4ca91632acbdaa4c9232b0dc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 11:36:53 +0100
Subject: [PATCH 108/305] libksysguard: update to 5.21.3.1.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index caad37be1ae3..e21b6bd070e8 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.21.3
+version=5.21.3.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c35218190c7af1e8cb144fbfdd9b15eb19479aef6e3182596cd2de8efc582742
+checksum=
 
 build_options="webengine"
 

From 5f45f276cdd3e4b65d0a9c883bc071dc87813d64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Mar 2021 11:37:41 +0100
Subject: [PATCH 109/305] libksysguard: update to 5.21.3.1.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e21b6bd070e8..ddbefd3b1872 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -10,8 +10,8 @@ short_desc="KDE libksysguard"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=
+distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=e370db775b575106f9d228596d3aa0da3ba568da9c2cf76de6e1d8ab60945e59
 
 build_options="webengine"
 

From 0c15ffcea1e7413097f526fc3934ff203203f9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 18 Mar 2021 08:37:23 +0700
Subject: [PATCH 110/305] git: update to 2.31.0.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index f428eaa963e6..115ce2fde63a 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.30.2
+version=2.31.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=41f7d90c71f9476cd387673fcb10ce09ccbed67332436a4cc58d7af32c355faa
+checksum=e8f162cbdb3283e13cd7388d864ed23485f1b046a19e969f12ed2685fb789a40
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From fb9dffafdc700706ee99b11899126de8fab5227c Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Thu, 18 Mar 2021 13:48:33 +0700
Subject: [PATCH 111/305] vivaldi: update to 3.7.2218.45

---
 srcpkgs/vivaldi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 5a02ed74ad89..81a02717c184 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.6.2165.40
+version=3.7.2218.45
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=7e60bd8c1c452e2208c54190d84646b56646c4f89e4a91f655653bfb68eb868a
+	checksum=e4d6f791dbb823bf4c3680049328a6bf9d3c2959a5d8c7d8df7cd90038e40387
 else
 	_debarch=i386
-	checksum=c68601c114f80dd0c1b0b801d94aadf82f6711ea9f02e050fd283f9a88fd9401
+	checksum=a30ccbe82261db9651457b01142bf0544db148cdbca7e515e8a03a430310dfdd
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From f5082f984869e65683adfb41ccd9f010a9cc8b12 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 17 Mar 2021 22:42:48 -0700
Subject: [PATCH 112/305] CLion: update to 2020.3.3.

---
 srcpkgs/CLion/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index cbefd0873f29..d260f410bae9 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2020.3.2
+version=2020.3.3
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=5d49bd88b6457271464687453ff65880a4a38974575bb76f969036c692072280
+checksum=2470365df5c682aec24e6ce88a87100232d0f26607522dda79572414fb944083
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -37,12 +37,14 @@ post_extract() {
 			rm -rf bin/clion.vmoptions
 			rm -rf bin/libyjpagent-linux.so
 			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
 		i686)
 			rm -rf bin/fsnotifier64
 			rm -rf bin/clion64.vmoptions
 			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
 

From 47041a3443c2ff7ef70050c6620e7fffdaa2d62b Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 17 Mar 2021 22:46:57 -0700
Subject: [PATCH 113/305] jetbrains-jdk-bin: update to 11.0.10b1379.1.

---
 srcpkgs/jetbrains-jdk-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 1521c48bfaa9..aa5fd1078ac3 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'jetbrains-jdk-bin'
 pkgname=jetbrains-jdk-bin
-version=11.0.10b1341.2
+version=11.0.10b1379.1
 revision=1
 archs="x86_64"
 wrksrc="jbrsdk"
@@ -12,7 +12,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
 _jdk_ver=${version%b*}
 _jdk_build=${version#*b}
 distfiles="https://dl.bintray.com/jetbrains/intellij-jbr/jbrsdk-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=692460c73e21592298d57362088ade4017d88fe4cd917f746be94b81a8fd7953
+checksum=224e21f5e59aa21ee81793a44b0bdbef62aba43030d7ea90c2e6dc78a4401f86
 fetch_cmd="wget --quiet"
 # This JDK appears to link to libs that do not exist, but functions well even in their absence.
 # Best guess is that they are optional. ¯\_(ツ)_/¯

From 7477ca1df287c5c42badcd3d61ebc59f051e49e1 Mon Sep 17 00:00:00 2001
From: Neel <neel@chot.ai>
Date: Thu, 18 Mar 2021 10:24:44 +0000
Subject: [PATCH 114/305] flameshot: update to 0.9.0

---
 srcpkgs/flameshot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index e81af9931f8e..d53c205e4a83 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.8.5
+version=0.9.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=f820c1f8cd464988cfcfc1af1fbcea2a3d0e5c4fb32accc3f54d93a8b5e1e890
+checksum=67e0b578ef8a68228e758cb59395bb7404b5c176e9dbc3ca2d83a63f154a6f22

From 8af9004716d67766d43c01c62c5eb38a7042d9ec Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@offlink.xyz>
Date: Thu, 18 Mar 2021 10:45:39 +0100
Subject: [PATCH 115/305] master-pdf-editor: update to 5.7.40

---
 srcpkgs/master-pdf-editor/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 6909faf947bb..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.20
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=d5f79a58028df1a9f3bac5220e620d33ddf65463544fdae0d486359081d6ce53
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5

From 8df8a257c1a6479fcef6c75637f464dc565a6a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 18 Mar 2021 12:08:08 -0300
Subject: [PATCH 116/305] thunderbird: update to 78.8.1.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index dc018ee585d9..a65381bbe89a 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.8.0
+version=78.8.1
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=3f36fa5ffc85888eaf77afb5cdd51bdadce841b7ae0744f5f5cd147ef4975a9d
+checksum=1a0b9cc1c314fdfdf7aa10246b8c5062385b62df3c9cef2358d1aa657e8a6f0f
 
 lib32disabled=yes
 

From aa3e5141944825748a309ef5f27826932cc4d2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 18 Mar 2021 12:08:21 -0300
Subject: [PATCH 117/305] thunderbird-i18n: update to 78.8.1.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 49f4ff54fe37..8db783cc2a36 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.8.0
+version=78.8.1
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="36ff00ccca1acc3103f977a199d78a755f7f7b1a581dd67ac066e2bcdca7d1cf
- a7bf06e1bc69b211f781c07ab0844341ef344b90b3d2bfb75cc04983c4514f77
- 4b5e2d278f6465654483eadf74f7e41787e79916685720b6305d4e1e2eb56181
- 7f538e38444a50763df413e10c486bf7bf991f58f0ee09117640d944d1aa309d
- 2700108616878f95aaca5f520c3063d5092618a7143f2c7b2c9b67d4bf8f9d4b
- 1cd73769267d18c938136013d2cd7231f27ee073bf945d9ad607bbd5abfba8de
- 9b8cd8005f2c23d04ab620b4516a3dd31152c5313c095fbd0a88d512cd0bed99
- 4ebdcbe2a4fb03271b07fdc5f605c80c422d7bb775f845da376454b34f82f65b
- e8646161d6c857e481fdc22870e8d0bc2686c79bd4c284c56ed3e9dfd2968718
- 0e9940d2be9dc74f6383df458cd45eb48b15f1e3338ad2e193e43b8d6b45fb56
- 134112b75ef140ab3502c5bbef45c1d91c2d5ce71b3bdb64699b72fe1afcf0fe
- 6c4b4c87b8241892c1349fe0b22580dda1bbf8ff59e0902c7d8082859a62d925
- 1952215daa911505511b6c5d428571471eb0c0817c1af58ee8e648afffbdc39f
- 7065352973ea351587bbcc668c5d46978432de9a5edc8e6cfaaad4edaf1d6cd9
- 513d97a0960bbc43f1e1469e6e437bbfe664dcb15a8d4666dd4af51414a41d94
- e4e9359658fab2619f97ad3ca94500159ccc029ea37cd065c5c2d2c62f31c641
- cad6e903883917fdde124ebd897470167c26d3bb58f29a809575224f6837671e
- b9c1c876f1c552bfa7404a2ddca2fda7a1765c24d036c415e8230f37888c8cc7
- 22fd6a07eb5975e205aba1e3051f69d92b8069df114d9629d06de4650ae2e67b
- d7b0c8799a696529b882f401bd5695e8d72acbfa746fea197af57e1f5cc1b390
- 76c5d070c907ffaa3dbdae2a2ae975b4688df06827d46075ac9847d16f5a030b
- 10d47e3db429ef1dd46344f8b5e1ab1251429878b5f6e5639aa4d1517f7eee6e
- 52c2a22fed05cb068c8b84c2812cf1a09c2921e9c945a25e768ceb45fd6be1ff
- 8d523631571c50747eae5f24d4da6e3e4e917235bba6568c0d530dd761e94931
- 37e3660753b5ce2671476cdf2d2293d9f0cf3994763031de308b67ec8b1eca0a
- 7417d3806ab290f82b1cedb62f41aeb25d47f9cb396f86efbe9eae1c05834b54
- ef0e1adbcf735876c90935a3276bd4b808897e4f3add755d0fcb6d4781444378
- 766cb60ebdda38dd2dcc8db3084218cbdb9bb92b06baae228556ebd7e37396fa
- 5bc54287c4df4ebc01d7fe38b7f4accc8d9565ed9c73c45f73fbd3475c2bc84d
- d46f2e6c3b6fbc55a12713dc40033bb89f9c7ad7d601d967b33ff5fc080ec5d9
- a2adcd1371fbb05ad6c09e1d6d93bcf16a4dccad845c85b671b4fc4c5069ab34
- 31b9b6c62faaeec0c8681ec1cd94c63f900d69e9b32c0660d05a0d0750e5305c
- a188ce41afa62219b6205d935dd08c8a6b54b6bb758a30eaf6e5a08c9ba6de46
- 9b2692f12348cb23658f4af92993dd1aeb579854dae61e28272d92b43f7b2c46
- ccd3666625c3989542b9137dde4a4e24963c30a0db9aefcde20fdc26f9c57155
- 5ae63fbe71a2b345c81ffe39b5705fc66ff726170d48a3401de43a528c8cb225
- 5bd735307a06bbee488f393e2d5656d708a4ed76bc706dfce2f83c78b29666a8
- 082d108a844d4bca9f650044879da812118d5c26b7d110a5a4ed3497abb7d5bd
- c4732c8a663a30e9a5d51610acb015651bfe8940a22b140dd176ccdf5423dd31
- 59f5c1ece837e94b5667c006f16e8624d4ca4bf8e1a827a1e56726b73ede1a89
- fd3037ec680f4f9219c3de3aa862bfce7ce811fc221513dba6f9aeb4f028c9fb
- ca1e0ec0c3d21ffc0fd957dc028f91fde9be2f8f00d2de4921dc3654b9928732
- 5d0c02475d457480b52e0e46199d253db94b13b20a9efbb90624e5fa9492a752
- b4c671d572578ce802ab25a0daaeddf81dac5f7e74b119a66e389a0a1e040df8
- 6eea4e0a484eef91a1d9bf5ac6589db3e8e03c91b7fdcd3c4c29b633893d055c
- df30cc52cdf7c0755e768531df7817dec72e03bada83fc85baf4fc33ea5829eb
- 4444448f0d5ada26527b3c290cabed8d2ef63613a57623f0275a7497518d73fe
- fffb80d4ff700852d09995874bd561dc9c607e6a9b3de09ae958b457dbea9da4
- 6a3bc8b51ccf4b10e8e7a4405fe670efe68da1d79ab8c9924d10d9d5aff602d8
- 309b9a79e57ac7d365fa549530fc33e576bae7180bf20cb0f74ebe4c94f5d450
- 764ba8366347b082a7cf1e0c5243a60364773eb5c39ed43e1aade779a9102969
- 3f93807a66d4fcc3ad8fb61cb1557afac9745330ed7b76cbd7a9e388c78997cf
- b5624458cd469e784423bb24719557277d3b48479aba2b6f4b610ee8c5fa72f2
- 6a2cee4ab86d55d82264dcb26bbeeca1cc8120cf11220b4e431239f74c623092
- 668075cdb8f2f592ed713f0b2dd483c579593be030df5ceba1c5acaecaf12f39"
+checksum="3b5caf336a8745d04f33ea7f1f49ff418d07b1f45b1c405a5b6aec4aff40ff5a
+ ef2c57a0837e10b8907b0f79387113a1455eb4a2012e4657a2fde579c597b8e6
+ bf8f2a717308963b1141e83ecdf0a692a4b2157145b0529ee21adf265c7ee623
+ 0a0cdf0d9c7657800c873c1fbf0d38576ef8def43698c2a5a268a560edc248db
+ 4999fb95a43ffe02febdc30edd64eb7c428b54fec5ac0222bf129a044eba54e3
+ a63ee258b84dabc1f540fb71bcd43a57e62647864d9bb301c17bfce3f819442d
+ 2731288a62486e544e8f950af6a24abe7fb111a35072205aef262be48bf53028
+ 5d356f0ebb24d9cf8e76e9099cdc399145f0c636c69bf4824fc4e21284b75bfb
+ 035f9cecea490c8f2b0686ae05b23ac75fbd356cd512174925529f1082ac6b9f
+ cd8f59690c872bb6029ee86a681a246eafd4a4400234a2aa899b3093900b4d95
+ 0b3cc842492d67586e8b9ab8a73c96c19e86ba8b15a77b60c31f05ed07ce9f86
+ 94c36a768ea104a480e71c3991446f8285f3f2f5afe91e9239607704b72709ac
+ ace84f5769e7c120585ecb2baa4ad758aaeec44cdca09232ca3d48e5f6640ed9
+ c482477cbc043e44e446cd0c74de711dc7789ae8813ff2771db433c91f49dce7
+ a2eed0c82901778094b79637f3d389c7273b8b9d99be81445d9689e87854dfa5
+ 95113edd17076555542713b3c7a54eee25f9283e410bf02b3a0ce02172cbc3e4
+ 0778d1ab5a52e1d658bccea604c851a7e13b32b6ce2f08f6e306ed80697b1338
+ c0a603a62fc97768bb02a1b5907f0175bb2047354d2dac05319c233b896f4d64
+ 3e79273f15994c4b7c7a8f350e5a20a255b1907cdd084b5e99912a86406f3167
+ 168f8d9590e41d57e242e24d181ed246f608eb6581482d20bdfb434650b9b8c8
+ 9fbb1fa328728bc5972f12c808d474ffad3eb17e9726e78593bb008e95bc0cad
+ b5909d54a31540d5c1027f50f100c7b35ef1cdd785123a3e760c9bc7be02a8dd
+ c32bdb8eac84fdf70d37cd8561fa9b7cbe7feda9fe39460ab3e30de65f1b6ea5
+ f87c979d0c90b4d6167654d8a03fc1f1402719d915d8d68f2c15756b7b63019d
+ a7f9a5ab5c05f3f1e56a51c7df4245c3f210ff0bc1b0dd18df4f331e52a98d29
+ dd4e3e14357a88116138bdacdb4ea262c3969726a193ad8037ae96423e54067b
+ e84e60069fcf580b4ebdc714fc908c62650daa3f610800b96f1a5da2f20304a0
+ 909e92d13592ac33718dd918c5d93c38b5467ac5ee7d43d346a21acd34e2fbd8
+ 0d984a9d089ba8b5d52a73948e1ac571c6a0fd1e07529cd207ff65164584b203
+ 6543f4a0046c4b80d3d4d369d7f332c860a2f0d88ceda54cae3f7a1001a3635e
+ 2a87b79515bb276455b82f38a5be0aef736aa1fecda6942d78948b8097ba54bc
+ 6e9a69b9fcbce800ae1545a6816a6bbd4e9233c13c2dc6cfd97c88c4002d9f43
+ f067c252a9f4625744138a16051290675c76f0c48c674bea7b4a6c6abd4367ab
+ 9f157020814ed8000eebb211c8161275660a44cd62f7e731d9aea71c28de1b45
+ 41f41a33717b0628486a47b94d0aa09acf1b77d3ccb15a3a7709673a8659444c
+ 8651f251b0db764a6880b84bc993b749db4f7caaba2e41e8ec3bdb2f29c7e55d
+ 55b1100d77dee61ffb232872162d5543e6104f044fb7193436d75a4f528c316f
+ 404af38ab6c28369edd2c9bbf2abb63e223c17f58fd4c8fc70052eae03a01f03
+ c442d5c44f85c4d50d582790fc90e989af57f31d04c3bbd528b2e91393ec408e
+ 50cf3279da4dfaecefd7963a20fc47eb4205959dd18fe8e3d9d275ce69b85a39
+ 9a12508720f0ff8968cd20dfc4bf0bdffe7bc6e76d071cfd87c6227323162b49
+ 10b9fdf09e5f3b45ab5e41eb0d76ee01667810a0711c4406fa5547d10275466e
+ 3247fae4d15d56eba36d9fa272e0ff6130b0d59c4aed604545a4bfd209fd0367
+ 4e1e066b39b20ddac404af5cfa992eafe137c2578b5ccaa6d2a7d4b1bbd96bcd
+ ff853296394e6b6e297a593b2220a5b23bebc22481fe84b3f1bd942116686fdc
+ 1f0a87eb63c33698e28c2aba01d87a9919065dbd1d67801f1f2e7bfabf3de127
+ 6f1fc3812ad3df192aa36baef400d194d1238c5630242ae6a2306cce5188609d
+ 4533c4bfbf71b25977b5d9e5b951545f0f8d036c2711c35ffce058e66e88b37f
+ cd93569d7f5d9dfbac5720188d25828a30b3e36c08a2e74a6f4188b342fd4603
+ 771c561fb6b821dad83a3772720bc835bc14305f0b4c60eab9e3e72595da91e7
+ e1565ba9f1712de7348ffacc4189b9c09209803b80a190481625946099e419e0
+ e946252285a1462ab7f099268efdb0cc15bc13bc42f70de744bbbce0672a3188
+ 78a9ddd5291e5efecec3ab339b7b821540abc22aacf00c06227ba4a4bf44ee2f
+ 6877de0d388f75e96c4b22b27a2ef4affad94bde1bc890c3eea1f30b7f4e06fa
+ 03c562d04b1d1fe6b84326cc833223d7a6998c3ab7f3c2d65920bc0c331ecf51"

From e354b9b29614072fce3d0aa86d15bbeb24db7a14 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Wed, 17 Mar 2021 10:21:16 +0100
Subject: [PATCH 118/305] kbd: update to 2.4.0 and merge kbd-data

---
 srcpkgs/kbd-data     |  1 -
 srcpkgs/kbd/template | 19 ++++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/kbd-data

diff --git a/srcpkgs/kbd-data b/srcpkgs/kbd-data
deleted file mode 120000
index 04e5d3b5d7ec..000000000000
--- a/srcpkgs/kbd-data
+++ /dev/null
@@ -1 +0,0 @@
-kbd
\ No newline at end of file
diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template
index e88ebf5d7fb1..10b5c5dba294 100644
--- a/srcpkgs/kbd/template
+++ b/srcpkgs/kbd/template
@@ -1,18 +1,18 @@
 # Template file for 'kbd'
 pkgname=kbd
-version=2.3.0
-revision=2
+version=2.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale"
 hostmakedepends="automake libtool gettext-devel flex pkg-config"
 makedepends="pam-devel"
-depends="kbd-data"
 short_desc="Linux keyboard utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kbd-project.org/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=685056143cb8effd0a1d44b5c391eb50d80dcfd014b1a4d6e2650a28d61cb82a
+checksum=55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f
+replaces="kbd-data>=0"
 
 post_patch() {
 	# Rename keymap files with the same names
@@ -42,14 +42,3 @@ post_install() {
 		rm -rf ${DESTDIR}/usr/share/kbd/keymaps/${f}
 	done
 }
-
-kbd-data_package() {
-	short_desc+=" - keymaps, console fonts and unicode maps"
-	replaces="kbd<2.0.1_1"
-	pkg_install() {
-		vmove usr/share/kbd/consolefonts
-		vmove usr/share/kbd/consoletrans
-		vmove usr/share/kbd/keymaps
-		vmove usr/share/kbd/unimaps
-	}
-}

From 1e2019df5f101287a689bd7dbc845c99ef89e963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 18 Mar 2021 15:24:41 -0300
Subject: [PATCH 119/305] linux5.11: update to 5.11.7.

---
 srcpkgs/linux5.11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index b385fba645df..0a8de535c05c 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.6
+version=5.11.7
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- 0306b61e431413af6991bb0d8ae0f1b72b508cc36380a225399030049d961ea4"
+ cd7f9ec4ff4181422780a6c0206b8cea013d0d221e3c7d09de631108ce86b320"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 3a2637e951a15db3fdfe2f0d5ab230a8f96f1d0f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 18 Mar 2021 21:11:41 +0100
Subject: [PATCH 120/305] go-for-it: update to 1.9.2.

---
 srcpkgs/go-for-it/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go-for-it/template b/srcpkgs/go-for-it/template
index 82ad9bc1c338..938a12fea435 100644
--- a/srcpkgs/go-for-it/template
+++ b/srcpkgs/go-for-it/template
@@ -1,6 +1,6 @@
 # Template file for 'go-for-it'
 pkgname=go-for-it
-version=1.9.1
+version=1.9.2
 revision=1
 wrksrc="Go-For-It-${version}"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-only"
 homepage="https://github.com/JMoerman/Go-For-It"
 distfiles="https://github.com/JMoerman/Go-For-It/archive/${version}.tar.gz"
-checksum=9d48d0e45c4ac74972a015671b6dd70ff57435a7f66a1188d95e19ac6b5b2009
+checksum=0cc4f9a61fe4efa18bf81cccef0e0a737b4c58f0ed0b8ea9cc6976d5621d2430

From dfe2b89829d8cc1bae93d4e0c4517819bac59f6d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 18 Mar 2021 07:34:18 +0300
Subject: [PATCH 121/305] fish-shell: update to 3.2.1

---
 srcpkgs/fish-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 05daee1117aa..c39fd784c423 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=3.2.0
-revision=2
+version=3.2.1
+revision=1
 wrksrc="fish-${version}"
 build_style=cmake
 hostmakedepends="gettext"
@@ -13,7 +13,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=4f0293ed9f6a6b77e47d41efabe62f3319e86efc8bf83cc58733044fbc6f9211
+checksum=d8e49f4090d3778df17dd825e4a2a80192015682423cd9dd02b6675d65c3af5b
 register_shell="/bin/fish /usr/bin/fish"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 597298912a55eba7a01abe4fdcbdcf8eb1c9fc0b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 18 Mar 2021 00:41:16 +0200
Subject: [PATCH 122/305] i2pd: update to 2.37.0.

---
 srcpkgs/i2pd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index de188117e817..8e059004fb55 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
 # Template file for 'i2pd'
 pkgname=i2pd
-version=2.33.0
-revision=2
+version=2.37.0
+revision=1
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
 makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://i2pd.website/"
 changelog="https://raw.githubusercontent.com/PurpleI2P/i2pd/openssl/ChangeLog"
 distfiles="https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz"
-checksum=6a30eb410263d2da23d238758ad156e36983bff1ed347fe57789763ae986d0f4
+checksum=072e79e55d4feac9dc3c988000a21ba613eb0c5bc151105cbccebdf84176dced
 disable_parallel_build=yes
 
 conf_files="

From a2d2bf9a6182554ec90b1001ac4f74243d48cc36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 15 Mar 2021 23:07:44 +0100
Subject: [PATCH 123/305] u-boot-menu: use printf instead of echo

echo doesn't expand escapesequences in bash,
printf is the portable way to achieve this
---
 srcpkgs/u-boot-menu/files/kernel.d/extlinux | 20 ++++++++++----------
 srcpkgs/u-boot-menu/template                |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/u-boot-menu/files/kernel.d/extlinux b/srcpkgs/u-boot-menu/files/kernel.d/extlinux
index 2c724b101ff0..5a4465698a46 100644
--- a/srcpkgs/u-boot-menu/files/kernel.d/extlinux
+++ b/srcpkgs/u-boot-menu/files/kernel.d/extlinux
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 header() {
-	echo "TIMEOUT ${TIMEOUT}" > ${OUTFILE}
-	echo "DEFAULT entry0" >> ${OUTFILE}
-	echo "MENU TITLE Boot menu" >> ${OUTFILE}
+	printf "TIMEOUT %s\n" ${TIMEOUT} > ${OUTFILE}
+	printf "DEFAULT entry0\n" >> ${OUTFILE}
+	printf "MENU TITLE Boot menu\n" >> ${OUTFILE}
 }
 
 get_bootpath() {
@@ -18,19 +18,19 @@ add_kernel() {
 	fdt=$(get_bootpath "/boot/dtbs/dtbs-${ver}/${DTBPATH}")
 	cmdline="${CMDLINE}"
 
-	echo "LABEL entry${ENTRY}" >> ${OUTFILE}
-	echo "\tMENU LABEL Void Linux Version ${ver}" >> ${OUTFILE}
-	echo "\tLINUX ${kernel}" >> ${OUTFILE}
+	printf "LABEL entry%s\n" ${ENTRY} >> ${OUTFILE}
+	printf "\tMENU LABEL Void Linux Version %s\n" ${ver} >> ${OUTFILE}
+	printf "\tLINUX %s\n" ${kernel} >> ${OUTFILE}
 	if [ -e "${BOOTPART}/${initrd}" ]; then
-		echo "\tINITRD ${initrd}" >> ${OUTFILE}
+		printf "\tINITRD %s\n" ${initrd} >> ${OUTFILE}
 	fi
 	if [ -n "${USE_DEVICETREEDIR}" ]; then
-		printf "\tDEVICETREEDIR ${devicetreedir}\n" >> ${OUTFILE}
+		printf "\tDEVICETREEDIR %s\n" ${devicetreedir} >> ${OUTFILE}
 	elif [ -n "${DTBPATH}" ] && [ -e "${BOOTPART}/${fdt}" ]; then
-		echo "\tFDT ${fdt}" >> ${OUTFILE}
+		printf "\tFDT %s\n" ${fdt} >> ${OUTFILE}
 	fi
 	if [ -n "${cmdline}" ]; then
-		echo "\tAPPEND ${cmdline}" >> ${OUTFILE}
+		printf "\tAPPEND %s\n" ${cmdline} >> ${OUTFILE}
 	fi
 	ENTRY=$(expr ${ENTRY} + 1)
 }
diff --git a/srcpkgs/u-boot-menu/template b/srcpkgs/u-boot-menu/template
index 31ef746ba3ad..5c5fb87639c8 100644
--- a/srcpkgs/u-boot-menu/template
+++ b/srcpkgs/u-boot-menu/template
@@ -1,7 +1,7 @@
 # Template file for 'u-boot-menu'
 pkgname=u-boot-menu
 version=0.2
-revision=1
+revision=2
 conf_files="/etc/default/extlinux"
 short_desc="Create an u-boot menu with currently available kernels"
 maintainer="Remi Pommarel <repk@triplefau.lt>"

From c681d41be9354314f5adff08abb5a73b885870fc Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Thu, 18 Mar 2021 14:46:10 -0600
Subject: [PATCH 124/305] jamulus: update to 3.7.0

---
 srcpkgs/jamulus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jamulus/template b/srcpkgs/jamulus/template
index 098aa9e0d774..8c2b5e8567c5 100644
--- a/srcpkgs/jamulus/template
+++ b/srcpkgs/jamulus/template
@@ -1,6 +1,6 @@
 # Template file for 'jamulus'
 pkgname=jamulus
-version=3.6.2
+version=3.7.0
 revision=1
 _version=r${version//./_}
 wrksrc=${pkgname}-${_version}
@@ -13,4 +13,4 @@ maintainer="KawaiiAmber <japaneselearning101@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://jamulus.io"
 distfiles="https://github.com/corrados/jamulus/archive/${_version}.tar.gz"
-checksum=6bea992f0e4b6a9d08104f8ad9d42b630d523da258e201f70418cecda1c11dac
+checksum=4c7469f29d23725216529f936136d2e7eee68139610f4a7016e01655426e216e

From 77164e02911189ec8b2c13ac5de2070d4ae06570 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 19 Mar 2021 12:32:16 +0100
Subject: [PATCH 125/305] skaffold: update to 1.21.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 9e0e85486026..3c82b7c2d6f8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.20.0
+version=1.21.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=d47ee974acf1c4432dab3ecdffeadbe271d2ff8098b811da2e73a04f9d9af957
+checksum=b82018c8e1937e29972d907c71b8eb28fd3f44e73a94525ec1d4f28511a243c5

From a2e75e5becdfbaff8f69c8718650e4287e3adeaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 19 Mar 2021 18:30:33 +0700
Subject: [PATCH 126/305] mediainfo: split cli

Yes, GUI doesn't depend on CLI.
However, I think noone really care about 99KB executable.
---
 srcpkgs/mediainfo-cli      |  1 +
 srcpkgs/mediainfo/template | 51 ++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 29 deletions(-)
 create mode 120000 srcpkgs/mediainfo-cli

diff --git a/srcpkgs/mediainfo-cli b/srcpkgs/mediainfo-cli
new file mode 120000
index 000000000000..76951070b852
--- /dev/null
+++ b/srcpkgs/mediainfo-cli
@@ -0,0 +1 @@
+mediainfo
\ No newline at end of file
diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template
index 03e2e46b90bd..a5e292453f10 100644
--- a/srcpkgs/mediainfo/template
+++ b/srcpkgs/mediainfo/template
@@ -1,12 +1,12 @@
 # Template file for 'mediainfo'
 pkgname=mediainfo
 version=20.09
-revision=1
+revision=2
 wrksrc=MediaInfo
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libmediainfo-devel zlib-devel $(vopt_if GUI wxWidgets-gtk3-devel)"
-depends="$(vopt_if GUI 'desktop-file-utils hicolor-icon-theme')"
+makedepends="libmediainfo-devel zlib-devel wxWidgets-gtk3-devel"
+depends="desktop-file-utils hicolor-icon-theme mediainfo-cli"
 short_desc="Display technical and tag data for video and audio files"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause"
@@ -15,15 +15,8 @@ distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname
 checksum=39327ef83caa38a96114d1b90654012b9ef727538fe82c37dd67aea2cf4f0f67
 replaces="mediainfo-gui>=0"
 
-build_options="CLI GUI"
-build_options_default="CLI GUI"
-desc_option_CLI="Build CLI version"
-desc_option_GUI="Build GUI version"
-
 do_configure() {
-	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-
-	for d in $targets; do
+	for d in CLI GUI; do
 		cd $wrksrc/Project/GNU/$d
 		autoreconf -fi
 		./configure ${configure_args}
@@ -31,29 +24,29 @@ do_configure() {
 }
 
 do_build() {
-	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-
-	for d in $targets; do
+	for d in CLI GUI; do
 		cd $wrksrc/Project/GNU/$d
 		make ${makejobs}
 	done
 }
 
 do_install() {
-	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-
-	for d in $targets; do
-		cd $wrksrc/Project/GNU/$d
-		make DESTDIR="${DESTDIR}" install
-	done
-	vlicense ${wrksrc}/License.html
+	cd $wrksrc/Project/GNU/GUI
+	make DESTDIR="${DESTDIR}" install
+
+	vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.svg 644 \
+		usr/share/icons/hicolor/scalable/apps mediainfo.svg
+	vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.png 644 \
+		usr/share/pixmaps mediainfo-gui.png
+	vinstall ${wrksrc}/Project/GNU/GUI/mediainfo-gui.desktop 644 \
+		usr/share/applications
+}
 
-	if [ "$build_option_GUI" ]; then
-		vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.svg 644 \
-			usr/share/icons/hicolor/scalable/apps mediainfo.svg
-		vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.png 644 \
-			usr/share/pixmaps mediainfo-gui.png
-		vinstall ${wrksrc}/Project/GNU/GUI/mediainfo-gui.desktop 644 \
-			usr/share/applications
-	fi
+mediainfo-cli_package() {
+	short_desc+=" - CLI"
+	pkg_install() {
+		cd ${wrksrc}/Project/GNU/CLI
+		make DESTDIR="${PKGDESTDIR}" install
+		vlicense ${wrksrc}/License.html
+	}
 }

From 4eb6d7e47da4bbb882fdb1d06386a271eeef1980 Mon Sep 17 00:00:00 2001
From: Alex <60660439+AlexDltg@users.noreply.github.com>
Date: Fri, 19 Mar 2021 14:20:51 +0100
Subject: [PATCH 127/305] intellij-idea-community-edition: update to 2020.3.3.

---
 srcpkgs/intellij-idea-community-edition/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 4e8d1a29ac11..dac8726ad47a 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2020.3.2
+version=2020.3.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=6ee7cc7aa368d6ebec14b6536827cbb3dca5506245db3d2fa2a18f2ab9d6e3c0
+checksum=200b759b0d0410a9cae57d839c5f2b0f1e454b1b340206cf3edc2d03d29558be
 repository=nonfree
 nopie=yes
 python_version=3

From 08a6d3557392d1b651013074d6b3d796b950d248 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 19 Mar 2021 13:09:42 +0100
Subject: [PATCH 128/305] exo: update to 4.16.1.

---
 srcpkgs/exo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 52ba265d7f14..67f2d595f2cc 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,7 +1,7 @@
 # Template file for 'exo'
 pkgname=exo
-version=4.16.0
-revision=2
+version=4.16.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
-checksum=1975b00eed9a8aa1f899eab2efaea593731c19138b83fdff2f13bdca5275bacc
+checksum=528dac256315ffc2a4a53b3b421979327962121989886e3cf920aeff9912b53b
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then

From 3905bad496df4b67bb1194cc6e385fd0b598c904 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Mar 2021 23:22:40 +0100
Subject: [PATCH 129/305] nemo: update to 4.8.6.

---
 srcpkgs/nemo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index e89c63f829b8..7760e034163f 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=4.8.4
+version=4.8.6
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo"
 distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
-checksum=089740d1a52a98e8bc0cda9d0512822e0b6b12d2a09c3d857b01a3232156f98a
+checksum=bcaca1268d5f3b47d08c0524bea2fa3f1cb9861a7a7469a06320ab82504e1eae
 python_version=3
 
 do_check() {

From 2cc28e9b4f755e64c834a55cd3405347b2328a69 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 19 Mar 2021 08:38:05 +0100
Subject: [PATCH 130/305] ckb-next: update to 0.4.4.

---
 srcpkgs/ckb-next/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ckb-next/template b/srcpkgs/ckb-next/template
index dd05e0d4d106..ad5ff48f8f4a 100644
--- a/srcpkgs/ckb-next/template
+++ b/srcpkgs/ckb-next/template
@@ -1,6 +1,6 @@
 # Template file for 'ckb-next'
 pkgname=ckb-next
-version=0.4.3
+version=0.4.4
 revision=1
 build_style=cmake
 configure_args="-DDISABLE_UPDATER=1 -DUDEV_RULE_DIRECTORY=/usr/lib/udev/rules.d"
@@ -14,7 +14,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ckb-next/ckb-next"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e4fbd14227ecc63fad9eaf705ca61defd7b44bcaa3ad29aae18cd8a69bbc9ef9
+checksum=6946bd035cdbbbd2f139e543d2ca84ba422176c62c3a3665b544118dc6d618d0
 build_options="pulseaudio"
 build_options_default="pulseaudio"
 desc_option_pulseaudio="Enable support for music visualizer animation"

From c140d06b1dc03444eea16cd9b06cb82f404a0836 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 18 Mar 2021 19:35:14 +0200
Subject: [PATCH 131/305] ulauncher: update to 5.10.0.

---
 srcpkgs/ulauncher/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index d3e0122644d4..00773c6c4585 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,7 +1,7 @@
 # Template file for 'ulauncher'
 pkgname=ulauncher
-version=5.7.5
-revision=3
+version=5.10.0
+revision=1
 wrksrc=${pkgname}
 build_style=python3-module
 hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
@@ -14,7 +14,7 @@ maintainer="Alberto Pau <me@albertopau.com>"
 license="GPL-3.0-or-later"
 homepage="https://ulauncher.io/"
 distfiles="https://github.com/Ulauncher/Ulauncher/releases/download/${version}/${pkgname}_${version}.tar.gz"
-checksum=b127a1eac3ebabe228dd6b0d8822af74fafc6376fe5d1420bd60a7894df3fd77
+checksum=f4211fa8e53b013f93caf871f9e8aa528ea0def9c567a3f7b2139365c4c1342a
 
 pre_build() {
 	export DISPLAY=

From 8414cfa70e6fa00db90900d71b43f05b6cb0f6ea Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 18 Mar 2021 19:24:03 +0200
Subject: [PATCH 132/305] uriparser: update to 0.9.5.

---
 srcpkgs/uriparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uriparser/template b/srcpkgs/uriparser/template
index 441b6b535c11..36389d151f84 100644
--- a/srcpkgs/uriparser/template
+++ b/srcpkgs/uriparser/template
@@ -1,6 +1,6 @@
 # Template file for 'uriparser'
 pkgname=uriparser
-version=0.9.4
+version=0.9.5
 revision=1
 build_style=cmake
 make_check_target=test
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://uriparser.github.io/"
 distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.bz2"
-checksum=b7cdabe5611408fc2c3a10f8beecb881a0c7e93ff669c578cd9e3e6d64b8f87b
+checksum=dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c
 
 post_install() {
 	vlicense COPYING

From 9ca795b92eb63356b308cfa9ef5f809a2c719212 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Thu, 18 Mar 2021 18:00:45 +0100
Subject: [PATCH 133/305] pipewire: update to 0.3.24

---
 srcpkgs/pipewire/files/README.voidlinux            |  7 +++++++
 .../pipewire/patches/autostart-media-session.patch | 14 +++++++++-----
 srcpkgs/pipewire/template                          | 11 ++++++-----
 3 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/pipewire/files/README.voidlinux

diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
new file mode 100644
index 000000000000..7bcb761273b0
--- /dev/null
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -0,0 +1,7 @@
+Optional dependencies:
+
+* `alsa-pipewire` for alsa client support
+* `gstreamer1-pipewire` for the gstreamer plugin
+* `libjack-pipewire` for jack replacement
+* `libspa-bluetooth` for bluetooth support
+* `libspa-jack` for running pipewire and jack side-by-side
diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch
index 2051a868d463..9e2b92b9a665 100644
--- a/srcpkgs/pipewire/patches/autostart-media-session.patch
+++ b/srcpkgs/pipewire/patches/autostart-media-session.patch
@@ -1,11 +1,15 @@
---- src/daemon/pipewire.conf.in.orig	2021-03-04 16:54:52.950015583 +0100
-+++ src/daemon/pipewire.conf.in	2021-03-04 16:55:13.766016281 +0100
-@@ -203,7 +203,7 @@
+Upstream's config does not autostart pipewire-media-session anymore, which
+is an essential component. It's not easy to start it externally in a script
+since it needs the pipewire socket up, and Void doesn't have a mechanism to
+ensure it (systemd socket activation).
+--- src/daemon/pipewire.conf.in.orig	2021-03-18 17:45:02.025992827 +0100
++++ src/daemon/pipewire.conf.in	2021-03-18 17:47:17.606999440 +0100
+@@ -204,7 +204,7 @@
      # but it is better to start it as a systemd service.
      # Run the session manager with -h for options.
      #
--    @comment@"@media_session_path@" = { args = "" }
-+    "@media_session_path@" = { args = "" }
+-    @comment@{ path = "@media_session_path@"  args = "" }
++    { path = "@media_session_path@"  args = "" }
      #
      # You can optionally start the pulseaudio-server here as well
      # but it is better to start it as a systemd service.
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 7a7a6199a1be..171ea2d0d4c7 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,11 +1,11 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.23
+version=0.3.24
 revision=1
 build_style=meson
-configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
- -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true
- -Dvulkan=true -Dudevrulesdir=/usr/lib/udev/rules.d"
+configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
 # LDAC support can be enabled when ldacbt is packaged
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
@@ -18,7 +18,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=e9a9030032ba8f3b6f9e300dbf755ab439340cd4cbeb3e1bba6f1a18d2c9da92
+checksum=aeca2b44660c4f36eed29cc9c6ccb093ea2778fd0e4ed7665cdfc40b2a49873f
 conf_files="/etc/pipewire/pipewire.conf"
 
 replaces="libpulseaudio-pipewire>=0"
@@ -30,6 +30,7 @@ fi
 
 post_install() {
 	vlicense LICENSE
+	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 libpipewire_package() {

From b37cca7c265f37828e33b282d376857a48f71323 Mon Sep 17 00:00:00 2001
From: Daxot <filohin.pavel@yandex.ru>
Date: Fri, 19 Mar 2021 01:26:26 +0300
Subject: [PATCH 134/305] dwarffortress: update to 0.47.05

---
 srcpkgs/dwarffortress/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dwarffortress/template b/srcpkgs/dwarffortress/template
index 0a11dc5bd4e7..3d89fdd45ec1 100644
--- a/srcpkgs/dwarffortress/template
+++ b/srcpkgs/dwarffortress/template
@@ -1,7 +1,7 @@
 # Template file for 'dwarffortress'
 pkgname=dwarffortress
-version=0.47.04
-revision=3
+version=0.47.05
+revision=1
 _urlver=${version#*.}
 archs="x86_64"
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
 license="custom: Proprietary"
 homepage="http://www.bay12games.com/dwarves/"
 distfiles="http://www.bay12games.com/dwarves/df_${_urlver//./_}_linux.tar.bz2"
-checksum=1de5872bf3ac32906a0082129ec88d6879b6ac7059a3513607d628090b1328e6
+checksum=ac74a6dbb7d7d9621f430405080322ab50c35f6632352ff2ea923f6dc5affca3
 
 nostrip_files="Dwarf_Fortress"
 nopie="distfiles are precompiled as PIE"

From 83d201e720c3e0861560e322916e824f1ecacf6f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 19 Mar 2021 16:16:42 +0100
Subject: [PATCH 135/305] gscan2pdf: update to 2.11.2.

---
 srcpkgs/gscan2pdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index e77017debcfc..2ff0d3dbe66e 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'.
 pkgname=gscan2pdf
-version=2.11.1
+version=2.11.2
 revision=1
 build_style=perl-module
 hostmakedepends="perl gettext"
@@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="http://gscan2pdf.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=aa728071c43665e43f653f200ee477cb87580c7adab0412c8c72b512ddb32f2a
+checksum=fc20d3d357e685e8348a90101261e1a893d9fa7a3915dc07f0d0c997f180cdb9
 nocross=yes
 
 do_check() {

From b6bd6a6c33e115d8cd8b9f560e7ac03398b954a2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 19 Mar 2021 16:19:18 +0100
Subject: [PATCH 136/305] linux5.4: update to 5.4.106.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 8564910a48cf..d114a30a300c 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.105
+version=5.4.106
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=244e4cd16184285df55ec5a9501daba011aa8b85c5527ee05eab4592e70fb8b6
+checksum=cc873b2c39c1823d4bc4f6cde527943c8cfd28ae94cb517804b0f9679359c8db
 python_version=3
 patch_args="-Np1"
 

From 6863545914f0dad068d3cdfec6c7009d407ba5a4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 19 Mar 2021 16:20:38 +0100
Subject: [PATCH 137/305] linux4.19: update to 4.19.181.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index ffebf8584c05..0117501d4cba 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.180
+version=4.19.181
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=1da85d7c838ddd4858cdbf76a00fa0a99bf11584c5658d739b6b55b6a0b7bb5f
+checksum=5218ee33e92d9010e28d6cab62bf8c774a4f22d89747045920dc60fdd531a9cd
 python_version=2 #unverified
 patch_args="-Np1"
 

From 11a37a98a09b4ac86682d63e5553118314e9a6c5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 19 Mar 2021 16:43:41 +0100
Subject: [PATCH 138/305] audacity: orphan.

---
 srcpkgs/audacity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098c..c91520872ce5 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -13,7 +13,7 @@ makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
  ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Graphical cross-platform audio editor"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.audacityteam.org"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/Audacity-${version}.tar.gz"

From f0f672878ede705c781a8268619c0a011d449b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 19 Mar 2021 22:25:01 +0700
Subject: [PATCH 139/305] xbps-src/update_check: update pattern for GitHub

---
 common/xbps-src/shutils/update_check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 57077de58b81..911aa4da5178 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -121,7 +121,7 @@ update_check() {
             *github.com*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://github.com/$pkgurlname/tags"
-                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
+                rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
             *//gitlab.*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f1-5)"
                 url="$pkgurlname/tags"

From a9c58ba8c8d9b23525474f62a5154c3abdc409e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 19 Mar 2021 15:39:48 +0100
Subject: [PATCH 140/305] comrak: update to 0.10.0.

---
 srcpkgs/comrak/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/comrak/template b/srcpkgs/comrak/template
index d41256ba3285..9521e5adf1c1 100644
--- a/srcpkgs/comrak/template
+++ b/srcpkgs/comrak/template
@@ -1,14 +1,14 @@
 # Template file for 'comrak'
 pkgname=comrak
-version=0.9.1
-revision=2
+version=0.10.0
+revision=1
 build_style=cargo
 short_desc="CommonMark + GFM compatible Markdown parser and renderer"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="BSD-2-Clause"
 homepage="https://github.com/kivikakk/comrak"
 distfiles="https://github.com/kivikakk/comrak/archive/${version}.tar.gz"
-checksum=c5415987223ebcc64357eab720219d3d8393b61cedb58dc35396cc0249726986
+checksum=3df4f9c1196184d8b85651726204d0566dbfb1d7f9c94cb8a45988e8e44856d1
 
 post_install() {
 	vlicense COPYING

From ca341aa68118c1fe25392ab453a37c2f4b94e544 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 19 Mar 2021 12:33:29 +0100
Subject: [PATCH 141/305] fluidsynth: update to 2.1.8.

---
 srcpkgs/fluidsynth/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 581568a69813..ab9f741e9b99 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,8 +1,9 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.1.7
+version=2.1.8
 revision=1
 build_style=cmake
+make_check_target=check
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
@@ -12,12 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=365a1c0982efcaff724a7b05d26ce1db76bc7435aa4c239df61cbc87f04b6c90
-
-do_check() {
-	cd build
-	make check
-}
+checksum=a254efceff5d99f8d658d12d25318317f37307e6df852ec9baeb7da173496967
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 7a115343ddfd765a734a55bd68758dcb78bace46 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Fri, 19 Mar 2021 05:54:43 -0700
Subject: [PATCH 142/305] tintin: update to 2.02.10.

---
 srcpkgs/tintin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template
index 4bedfe3ab047..5bbd8c71a616 100644
--- a/srcpkgs/tintin/template
+++ b/srcpkgs/tintin/template
@@ -1,6 +1,6 @@
 # Template file for 'tintin'
 pkgname=tintin
-version=2.02.05
+version=2.02.10
 revision=1
 wrksrc=tt
 build_wrksrc=src
@@ -11,7 +11,7 @@ maintainer="Michael Taboada <voidpkgs@forwardme.email>"
 license="GPL-2.0-or-later"
 homepage="http://tintin.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz"
-checksum=63a70052122d24d69d7bc012395745f1a0412dffd456a8e8aab85704d44bd5a1
+checksum=079d316da0d5cfa2d737af647041e54dd00cd1b601a37f2bb127eb80251eaa1a
 
 post_install() {
 	for i in FAQ SCRIPTS README; do

From 37e0aa58963c5130a036834b0b71f1b251285b57 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Sat, 20 Mar 2021 03:50:16 +1100
Subject: [PATCH 143/305] libopenmpt: update to 0.5.6

---
 srcpkgs/libopenmpt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index abac187c2df4..3e427baeed40 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,6 +1,6 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.5
+version=0.5.6
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=f1e01483ebf1a680d9ec030c9af20f5f2a5ac0f1e0642c18bd5593cfaa9ceb6b
+checksum=17dea782b334c146f4acd948c7c31ffdd2afc899eb347ebe01be1606ea79f4b8
 
 post_install() {
 	vlicense LICENSE

From 59fcaf3000d6b1ad3e77c27181075d05b2021e58 Mon Sep 17 00:00:00 2001
From: Daxot <filohin.pavel@yandex.ru>
Date: Fri, 19 Mar 2021 17:48:11 +0300
Subject: [PATCH 144/305] minigalaxy: update to 1.0.2

---
 srcpkgs/minigalaxy/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minigalaxy/template b/srcpkgs/minigalaxy/template
index 87af28e6414d..e55146981e14 100644
--- a/srcpkgs/minigalaxy/template
+++ b/srcpkgs/minigalaxy/template
@@ -1,17 +1,22 @@
 # Template file for 'minigalaxy'
 pkgname=minigalaxy
-version=1.0.0
+version=1.0.2
 revision=1
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="hicolor-icon-theme webkit2gtk python3-gobject python3-requests"
+checkdepends="$depends"
 short_desc="Simple GOG client for Linux"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later, CC-BY-3.0"
 homepage="https://sharkwouter.github.io/minigalaxy/"
 changelog="https://github.com/sharkwouter/minigalaxy/blob/master/CHANGELOG.md"
 distfiles="https://github.com/sharkwouter/minigalaxy/archive/${version}.tar.gz"
-checksum=00c99cdff167a762d6e78891216d6a3ba889c970f198618472e15f398ed2c9b3
+checksum=9cb482760c68153f2fc8b8fe229d60033634bc0c7b83a6aa43a9cfa20ab2d0e9
+
+do_check() {
+	python -m unittest tests/*.py
+}
 
 post_install() {
 	vlicense THIRD-PARTY-LICENSES.md LICENSE

From a78efd083cdaabe5a4655493fc0442e0bc4c4cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 19 Mar 2021 18:05:30 +0100
Subject: [PATCH 145/305] cargo-crev: update to 0.19.1.

---
 srcpkgs/cargo-crev/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index cd177eac2907..cdd1b547cb71 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
-version=0.18.0
-revision=2
+version=0.19.1
+revision=1
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"
 homepage="https://github.com/crev-dev/cargo-crev"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=607b9218a71234afaf4ab9f2c7a3f8087a7b4b8c892232df9b0dfd21cd8cefa2
+checksum=2595915cb7dfa63248c6cd86cb0648122d61ba36de8f3cec0860d692d89b3605
 
 post_install() {
 	vlicense LICENSE-APACHE

From 7d26ded16b1f8fad895a137372318cf31221ca71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 19 Mar 2021 18:48:26 +0100
Subject: [PATCH 146/305] dua-cli: update to 2.11.1.

---
 srcpkgs/dua-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index 4f1904cf8730..0f17064e1d69 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.10.9
+version=2.11.1
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/Byron/dua-cli"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=7c19213fe241aaa1e956371e938905d53eefa1b36c06d9df8dc1258a6d130e70
+checksum=906a2c1cf5b19247fe1af92fb0bcb844095af91015341f04816e46c4b7b69872
 
 post_install() {
 	vlicense LICENSE

From 28ac1f32fd30f09ffe2dc29a695e69fda14569a0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 19 Mar 2021 00:49:45 +0200
Subject: [PATCH 147/305] monkey: fix the runit service: -remove the chpst
 invocation, because a) the 'monkey' user does not exist and b) the daemon
 drops privileges to the _monkey user by itself.

---
 srcpkgs/monkey/files/monkey/run | 2 +-
 srcpkgs/monkey/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monkey/files/monkey/run b/srcpkgs/monkey/files/monkey/run
index f499f3d2507a..95dad012d94d 100644
--- a/srcpkgs/monkey/files/monkey/run
+++ b/srcpkgs/monkey/files/monkey/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec chpst -u monkey:monkey monkey
+exec monkey
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index e910e31586f6..4037c1815258 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
 # Template file for 'monkey'
 pkgname=monkey
 version=1.6.9
-revision=3
+revision=4
 build_style=configure
 configure_args="--prefix=/usr --sbindir=/usr/bin
  --libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname

From 7481d5870e4e865eaf4699cb21e22e41246c658d Mon Sep 17 00:00:00 2001
From: Reed Wade <reedwade@misterbanal.net>
Date: Fri, 19 Feb 2021 15:02:16 +0100
Subject: [PATCH 148/305] ctags: update to 5.9.20210214.0

We moved from exhuberant_ctags to universal_ctags
---
 .../0001-Strip-libiconv-dependant-tests.patch | 195 ++++++++++++++++++
 srcpkgs/ctags/template                        |  19 +-
 2 files changed, 208 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch

diff --git a/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch b/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch
new file mode 100644
index 000000000000..821d0d1f6c87
--- /dev/null
+++ b/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch
@@ -0,0 +1,195 @@
+From 0f18f8c8a27ea88d0637ab3d86394265abcbb8f9 Mon Sep 17 00:00:00 2001
+From: Reed Wade <reedwade@misterbanal.net>
+Date: Tue, 23 Feb 2021 09:12:01 +0100
+Subject: [PATCH] Strip libiconv dependant tests
+
+Signed-off-by: Reed Wade <reedwade@misterbanal.net>
+---
+ .../input-encoding-option.d/exit-expected.txt |  1 -
+ Tmain/input-encoding-option.d/input.java      |  4 ----
+ Tmain/input-encoding-option.d/input.js        |  1 -
+ Tmain/input-encoding-option.d/run.sh          | 22 -------------------
+ .../stderr-expected.txt                       |  0
+ .../stdout-expected.txt                       |  0
+ .../input-encoding-option.d/tags-expected.txt | 14 ------------
+ .../exit-expected.txt                         |  1 -
+ Tmain/output-encoding-option.d/input.java     |  4 ----
+ Tmain/output-encoding-option.d/input.js       |  1 -
+ Tmain/output-encoding-option.d/run.sh         | 21 ------------------
+ .../stderr-expected.txt                       |  0
+ .../stdout-expected.txt                       |  0
+ .../tags-expected.txt                         | 14 ------------
+ 14 files changed, 83 deletions(-)
+ delete mode 100644 Tmain/input-encoding-option.d/exit-expected.txt
+ delete mode 100644 Tmain/input-encoding-option.d/input.java
+ delete mode 100644 Tmain/input-encoding-option.d/input.js
+ delete mode 100644 Tmain/input-encoding-option.d/run.sh
+ delete mode 100644 Tmain/input-encoding-option.d/stderr-expected.txt
+ delete mode 100644 Tmain/input-encoding-option.d/stdout-expected.txt
+ delete mode 100644 Tmain/input-encoding-option.d/tags-expected.txt
+ delete mode 100644 Tmain/output-encoding-option.d/exit-expected.txt
+ delete mode 100644 Tmain/output-encoding-option.d/input.java
+ delete mode 100644 Tmain/output-encoding-option.d/input.js
+ delete mode 100644 Tmain/output-encoding-option.d/run.sh
+ delete mode 100644 Tmain/output-encoding-option.d/stderr-expected.txt
+ delete mode 100644 Tmain/output-encoding-option.d/stdout-expected.txt
+ delete mode 100644 Tmain/output-encoding-option.d/tags-expected.txt
+
+diff --git Tmain/input-encoding-option.d/exit-expected.txt Tmain/input-encoding-option.d/exit-expected.txt
+deleted file mode 100644
+index 573541ac..00000000
+--- Tmain/input-encoding-option.d/exit-expected.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-0
+diff --git Tmain/input-encoding-option.d/input.java Tmain/input-encoding-option.d/input.java
+deleted file mode 100644
+index f1ebd5d6..00000000
+--- Tmain/input-encoding-option.d/input.java
++++ /dev/null
+@@ -1,4 +0,0 @@
+-class Foo { // FooƒNƒ‰ƒX
+-	public Foo() { // ƒRƒ“ƒXƒgƒ‰ƒNƒ^
+-	}
+-}
+diff --git Tmain/input-encoding-option.d/input.js Tmain/input-encoding-option.d/input.js
+deleted file mode 100644
+index 8bfcd659..00000000
+--- Tmain/input-encoding-option.d/input.js
++++ /dev/null
+@@ -1 +0,0 @@
+-var a = 1; // ÊÑ¿ô½é´ü²½
+diff --git Tmain/input-encoding-option.d/run.sh Tmain/input-encoding-option.d/run.sh
+deleted file mode 100644
+index 16a5d21b..00000000
+--- Tmain/input-encoding-option.d/run.sh
++++ /dev/null
+@@ -1,22 +0,0 @@
+-#!/bin/sh
+-
+-# Copyright: 2015 Yasuhiro MATSUMOTO
+-# License: GPL-2
+-
+-CTAGS=$1
+-BUILDDIR=$2
+-
+-. ../utils.sh
+-
+-if ${CTAGS} --quiet --options=NONE --list-features | grep -q iconv; then
+-  if ${CTAGS} --quiet --options=NONE \
+-	      --pseudo-tags=-TAG_PROC_CWD \
+-	      --input-encoding=utf-8 --input-encoding-java=cp932 --input-encoding-javascript=euc-jp \
+-	      -o ${BUILDDIR}/tags \
+-	      input.js input.java ; then
+-      remove_commit_id ${BUILDDIR}/tags
+-  fi
+-  exit $?
+-else
+-  skip "iconv feature is not available"
+-fi
+diff --git Tmain/input-encoding-option.d/stderr-expected.txt Tmain/input-encoding-option.d/stderr-expected.txt
+deleted file mode 100644
+index e69de29b..00000000
+diff --git Tmain/input-encoding-option.d/stdout-expected.txt Tmain/input-encoding-option.d/stdout-expected.txt
+deleted file mode 100644
+index e69de29b..00000000
+diff --git Tmain/input-encoding-option.d/tags-expected.txt Tmain/input-encoding-option.d/tags-expected.txt
+deleted file mode 100644
+index 07ddd7d6..00000000
+--- Tmain/input-encoding-option.d/tags-expected.txt
++++ /dev/null
+@@ -1,14 +0,0 @@
+-!_TAG_FILE_ENCODING	UTF-8	//
+-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+-!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
+-!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
+-!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+-!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
+-!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+-!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+-!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+-!_TAG_PROGRAM_VERSION	5.9.0	//
+-Foo	input.java	/^	public Foo() { \/\/ コンストラクタ$/;"	m	class:Foo
+-Foo	input.java	/^class Foo { \/\/ Fooクラス$/;"	c
+-a	input.js	/^var a = 1; \/\/ 変数初期化$/;"	v
+diff --git Tmain/output-encoding-option.d/exit-expected.txt Tmain/output-encoding-option.d/exit-expected.txt
+deleted file mode 100644
+index 573541ac..00000000
+--- Tmain/output-encoding-option.d/exit-expected.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-0
+diff --git Tmain/output-encoding-option.d/input.java Tmain/output-encoding-option.d/input.java
+deleted file mode 100644
+index 234c5b20..00000000
+--- Tmain/output-encoding-option.d/input.java
++++ /dev/null
+@@ -1,4 +0,0 @@
+-class Foo { // Fooクラス
+-	public Foo() { // コンストラクタ
+-	}
+-}
+diff --git Tmain/output-encoding-option.d/input.js Tmain/output-encoding-option.d/input.js
+deleted file mode 100644
+index 8bfcd659..00000000
+--- Tmain/output-encoding-option.d/input.js
++++ /dev/null
+@@ -1 +0,0 @@
+-var a = 1; // ÊÑ¿ô½é´ü²½
+diff --git Tmain/output-encoding-option.d/run.sh Tmain/output-encoding-option.d/run.sh
+deleted file mode 100644
+index 0687e610..00000000
+--- Tmain/output-encoding-option.d/run.sh
++++ /dev/null
+@@ -1,21 +0,0 @@
+-#!/bin/sh
+-# Copyright: 2015 Yasuhiro MATSUMOTO
+-# License: GPL-2
+-
+-CTAGS=$1
+-BUILDDIR=$2
+-
+-. ../utils.sh
+-
+-if ${CTAGS} --quiet --options=NONE --list-features | grep -q iconv; then
+-  if ${CTAGS}  --quiet --options=NONE \
+-	       --pseudo-tags=-TAG_PROC_CWD \
+-	       --output-encoding=cp932 --input-encoding=utf-8 --input-encoding-javascript=euc-jp \
+-	       -o ${BUILDDIR}/tags \
+-	       input.js input.java ; then
+-      remove_commit_id ${BUILDDIR}/tags
+-  fi
+-  exit $?
+-else
+-	skip "iconv feature is not available"
+-fi
+diff --git Tmain/output-encoding-option.d/stderr-expected.txt Tmain/output-encoding-option.d/stderr-expected.txt
+deleted file mode 100644
+index e69de29b..00000000
+diff --git Tmain/output-encoding-option.d/stdout-expected.txt Tmain/output-encoding-option.d/stdout-expected.txt
+deleted file mode 100644
+index e69de29b..00000000
+diff --git Tmain/output-encoding-option.d/tags-expected.txt Tmain/output-encoding-option.d/tags-expected.txt
+deleted file mode 100644
+index be3eae3f..00000000
+--- Tmain/output-encoding-option.d/tags-expected.txt
++++ /dev/null
+@@ -1,14 +0,0 @@
+-!_TAG_FILE_ENCODING	cp932	//
+-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+-!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
+-!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
+-!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+-!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
+-!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+-!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+-!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+-!_TAG_PROGRAM_VERSION	5.9.0	//
+-Foo	input.java	/^	public Foo() { \/\/ ƒRƒ“ƒXƒgƒ‰ƒNƒ^$/;"	m	class:Foo
+-Foo	input.java	/^class Foo { \/\/ FooƒNƒ‰ƒX$/;"	c
+-a	input.js	/^var a = 1; \/\/ •Ï”‰Šú‰»$/;"	v
+-- 
+2.30.1
+
diff --git a/srcpkgs/ctags/template b/srcpkgs/ctags/template
index 0065bd92b367..56b3c3dfdfa8 100644
--- a/srcpkgs/ctags/template
+++ b/srcpkgs/ctags/template
@@ -1,14 +1,21 @@
 # Template file for 'ctags'
 pkgname=ctags
-version=5.8
-revision=7
+version=5.9.20210214.0
+revision=1
+wrksrc=ctags-p${version}
 build_style=gnu-configure
+hostmakedepends="pkg-config automake python3-docutils"
 short_desc="Generates an index file of language objects found in source files"
 maintainer="Jan S. <jan.schreib@gmail.com>"
-license="GPL-3"
-homepage="http://ctags.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/ctags/${version}/ctags-${version}.tar.gz"
-checksum=0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7
+license="GPL-2.0-only"
+homepage="https://ctags.io/"
+distfiles="https://github.com/universal-ctags/ctags/archive/p${version}.tar.gz"
+checksum=26d9efe481a57e81195878cdb0baca730a3c4d234b9a7c4f6bf2c8def42bf42b
+
+do_configure() {
+	./autogen.sh
+	./configure ${configure_args}
+}
 
 do_install() {
 	make prefix=${DESTDIR}/usr bindir=${DESTDIR}/usr/bin mandir=${DESTDIR}/usr/share/man install

From 8d8dc14a2a3e21ffd5d7e4da0d0d862225b909aa Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 19 Mar 2021 06:55:43 +0100
Subject: [PATCH 149/305] links: update to 2.22

---
 srcpkgs/links/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index 06ca6e43960a..ae939fb90b2c 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,7 +1,7 @@
 # Template file for 'links'
 pkgname=links
-version=2.21
-revision=2
+version=2.22
+revision=1
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63
+checksum=0364986b3a7f1e8e3171bea362b53f71e1dd3360a8842d66fdc65580ebc2084d
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/share/doc/

From e34cd7e9a0cee6b5fd4d7a24d4759d509af6ed2f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 19 Mar 2021 06:56:07 +0100
Subject: [PATCH 150/305] links-x11: update to 2.22

---
 srcpkgs/links-x11/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index eb60b9fca0de..be7123b3eab7 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,7 +1,7 @@
 # Template file for 'links-x11'
 pkgname=links-x11
-version=2.21
-revision=2
+version=2.22
+revision=1
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
@@ -13,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63
+checksum=0364986b3a7f1e8e3171bea362b53f71e1dd3360a8842d66fdc65580ebc2084d
 conflicts="links"
 
 post_install() {

From 92e19ed6e027ae20dc13f73173f80b8b4cf81362 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 20 Mar 2021 00:19:08 +0300
Subject: [PATCH 151/305] gallery-dl: update to 1.17.1

---
 srcpkgs/gallery-dl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 7acebe307b3e..2b9e0b000db1 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.17.0
+version=1.17.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
 distfiles="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
-checksum=adf50cdb9b6344e51b5109e56fdb461af52f56c81992a9989fa8ef738235b611
+checksum=b18e822a4d0aa61a4bdb7dd0023b339e5df7370cf9d69724feffe1a6d66714e8
 
 do_check() {
 	make test

From 5f157a212ec1d8b0d58f16e819e275dd5f9b619d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 20 Mar 2021 01:08:28 +0400
Subject: [PATCH 152/305] osinfo-db: update to 20210312.

---
 srcpkgs/osinfo-db/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index da4243ed68f7..61623edce241 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210215
+version=20210312
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=1c8337b2ae3bfb49c89a26b0f828e38e0627048a2bc2603a53168d79f8d83598
+checksum=7548ec09e445ca7378c5ceb99e39edca8857f8293831e0b3cb558f4230870e10
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From 473544394b77bcd7024b99817085fcc3ce558a6b Mon Sep 17 00:00:00 2001
From: TC <git@titouan.co>
Date: Fri, 19 Mar 2021 19:30:05 +0100
Subject: [PATCH 153/305] chezmoi: update to 2.0.2.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 64326d00b139..49c6d1c61f2c 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=1.8.11
+version=2.0.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=23515591028202aaf7af908e38972f156ee08022f535bc74aaa9244b82da2fa1
+checksum=7e04e07b6b44ae1045fa4a8c5e723e80fe3ae4ea67d3400f6d8c2621a6a7cef3
 
 post_install() {
 	vlicense LICENSE

From c79e8ead0c05188aa90dfb8113491993c518a336 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Thu, 18 Mar 2021 15:23:49 -0600
Subject: [PATCH 154/305] nvidia: update to 460.67.

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index c854dd200074..3c2c5db76ed4 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=460.56
+version=460.67
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=4e571cba0d1f6f5116689dca9f4b396b3e7f6c3d4de14ce3143d52f834e57300
+checksum=2f6711c92570ee681848ddb998957e6f8b8e7874dd8cb1af14f124c32160b5e7
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}

From b0cb818ce37e52faf5b821a3711a3de658848eb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 20 Mar 2021 12:12:46 +0100
Subject: [PATCH 155/305] qt5-webengine: import upstream patch to fix crashes
 with a lot locales

without this only en_GB and en_US seem to work
---
 .../qt5-webengine/patches/QTBUG-91715.patch   | 124 ++++++++++++++++++
 srcpkgs/qt5-webengine/template                |   2 +-
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qt5-webengine/patches/QTBUG-91715.patch

diff --git a/srcpkgs/qt5-webengine/patches/QTBUG-91715.patch b/srcpkgs/qt5-webengine/patches/QTBUG-91715.patch
new file mode 100644
index 000000000000..db90ebed7c1d
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/QTBUG-91715.patch
@@ -0,0 +1,124 @@
+From 199ea00a9eea13315a652c62778738629185b059 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Wed, 10 Mar 2021 17:14:27 +0100
+Subject: [PATCH] Fix normalization of app locales
+
+Use the internal Chromium routine to get the app locale Chromium
+expects.
+
+Fixes: QTBUG-91715
+Change-Id: I5042eb066cb6879ad69628959912f2841867b4e8
+Reviewed-by: Michael Brüning <michael.bruning@qt.io>
+---
+
+diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
+index e13ecd8..c2c78ff 100644
+--- a/src/core/content_browser_client_qt.cpp
++++ b/src/core/content_browser_client_qt.cpp
+@@ -471,7 +471,12 @@
+ 
+ std::string ContentBrowserClientQt::GetApplicationLocale()
+ {
+-    return WebEngineLibraryInfo::getApplicationLocale();
++    std::string bcp47Name = QLocale().bcp47Name().toStdString();
++    if (m_cachedQtLocale != bcp47Name) {
++        m_cachedQtLocale = bcp47Name;
++        m_appLocale = WebEngineLibraryInfo::getApplicationLocale();
++    }
++    return m_appLocale;
+ }
+ 
+ std::string ContentBrowserClientQt::GetAcceptLangs(content::BrowserContext *context)
+diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
+index 7c8aa3a..1ccd292 100644
+--- a/src/core/content_browser_client_qt.h
++++ b/src/core/content_browser_client_qt.h
+@@ -269,6 +269,8 @@
+ 
+ private:
+     scoped_refptr<ShareGroupQtQuick> m_shareGroupQtQuick;
++    std::string m_appLocale;
++    std::string m_cachedQtLocale;
+ };
+ 
+ } // namespace QtWebEngineCore
+diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
+index 2ad5b75..09a4141 100644
+--- a/src/core/web_engine_library_info.cpp
++++ b/src/core/web_engine_library_info.cpp
+@@ -46,6 +46,7 @@
+ #include "components/spellcheck/spellcheck_buildflags.h"
+ #include "content/public/common/content_paths.h"
+ #include "sandbox/policy/switches.h"
++#include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/ui_base_paths.h"
+ #include "ui/base/ui_base_switches.h"
+ 
+@@ -353,18 +354,15 @@
+ std::string WebEngineLibraryInfo::getApplicationLocale()
+ {
+     base::CommandLine *parsedCommandLine = base::CommandLine::ForCurrentProcess();
+-    if (!parsedCommandLine->HasSwitch(switches::kLang)) {
++    if (parsedCommandLine->HasSwitch(switches::kLang)) {
++        return parsedCommandLine->GetSwitchValueASCII(switches::kLang);
++    } else {
+         const QString &locale = QLocale().bcp47Name();
+-
+-        // QLocale::bcp47Name returns "en" for American English locale. Chromium requires the "US" suffix
+-        // to clarify the dialect and ignores the shorter version.
+-        if (locale == "en")
+-            return "en-US";
+-
+-        return locale.toStdString();
++        std::string resolvedLocale;
++        if (l10n_util::CheckAndResolveLocale(locale.toStdString(), &resolvedLocale))
++            return resolvedLocale;
+     }
+-
+-    return parsedCommandLine->GetSwitchValueASCII(switches::kLang);
++    return "en-US";
+ }
+ 
+ #if defined(OS_WIN)
+diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+index 0219863..bf2c28a 100644
+--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
++++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+@@ -123,6 +123,7 @@
+     void doNotBreakLayout();
+ 
+     void changeLocale();
++    void mixLangLocale();
+     void inputMethodsTextFormat_data();
+     void inputMethodsTextFormat();
+     void keyboardEvents();
+@@ -1210,6 +1211,29 @@
+     QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar"));
+ }
+ 
++void tst_QWebEngineView::mixLangLocale()
++{
++    for (QString locale : { "en_DK", "de_CH", "eu_ES" }) {
++        QLocale::setDefault(locale);
++        QWebEngineView view;
++        QSignalSpy loadSpy(&view, &QWebEngineView::loadFinished);
++
++        bool terminated = false;
++        auto sc = connect(view.page(), &QWebEnginePage::renderProcessTerminated, [&] () { terminated = true; });
++
++        view.load(QUrl("qrc:///resources/dummy.html"));
++        QTRY_VERIFY(terminated || loadSpy.count() == 1);
++
++        QVERIFY2(!terminated,
++            qPrintable(QString("Locale [%1] terminated: %2, loaded: %3").arg(locale).arg(terminated).arg(loadSpy.count())));
++        QVERIFY(loadSpy.first().first().toBool());
++
++        QString content = toPlainTextSync(view.page());
++        QVERIFY2(!content.isEmpty() && content.contains("test content"), qPrintable(content));
++    }
++    QLocale::setDefault(QLocale("en"));
++}
++
+ void tst_QWebEngineView::inputMethodsTextFormat_data()
+ {
+     QTest::addColumn<QString>("string");
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 2a34623c81ea..b647a92d46a1 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
 version=5.15.3
-revision=1
+revision=2
 _commit=a059e7404a6db799f4da0ad696e65ae9c854b4b0
 _chromium_commit=d9d9e606cb34b1b4ac0f44de132b1eb10763f1f6
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"

From 378d9d0935b24343189662acaa3f476a601586d4 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoang@wetrust.io>
Date: Fri, 19 Mar 2021 21:15:40 -0700
Subject: [PATCH 156/305] go-ethereum: update to 1.10.1.

---
 srcpkgs/go-ethereum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go-ethereum/template b/srcpkgs/go-ethereum/template
index d7a5c157a853..65671a6bdbce 100644
--- a/srcpkgs/go-ethereum/template
+++ b/srcpkgs/go-ethereum/template
@@ -1,6 +1,6 @@
 # Template file for 'go-ethereum'
 pkgname=go-ethereum
-version=1.9.25
+version=1.10.1
 revision=1
 build_style=go
 go_import_path=github.com/ethereum/go-ethereum
@@ -17,7 +17,7 @@ maintainer="Hoang Nguyen <hoang@wetrust.io>"
 license="GPL-3.0-only"
 homepage="https://github.com/ethereum/go-ethereum"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=d7b733aeef4eba97f5351ba435001fa7365f55adabffdfdda909700335e98b0e
+checksum=485ff7b9e5a34457ab424d7e2cb8d377dc571e8daf666e065a0a327b9e413cab
 
 geth_package() {
 	short_desc="Official Go implementation of the Ethereum protocol"

From a9353067ba118a595aae62072f9602f272dcf309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:38 +0100
Subject: [PATCH 157/305] filelight: update to 20.12.3.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index ef21de2f96db..0ceb7e92fc8e 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=d8108940ab96933e6edec39e16f693d9f37b5d91e4d9d873baf19f9f018d6854
+checksum=206a70d9aa2d5ba025cb5ab84d860843a163919f26517eca5c0108b123be4a5a

From f45849540317fee5d823b2d24991c1164854bc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:39 +0100
Subject: [PATCH 158/305] kaccounts-integration: update to 20.12.3.

---
 srcpkgs/kaccounts-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 7be3543d950b..b018988aada9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=d2cd7db9a66fa60530db93be3de744166b13ba83ffc47f18e85b2a6dae3bfe96
+checksum=98390b72fbb3eb26a892f6f2169d71df754dd44887ed599116b624012297a655
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From 66f20114fd410a6c6a9847de45866e6b1aa72753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:40 +0100
Subject: [PATCH 159/305] kaccounts-providers: update to 20.12.3.

---
 srcpkgs/kaccounts-providers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 5909cbee76f3..a5094cd0fcc3 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=804905e0ccedf53ba9c334a4a488cffeaaa5ea5bf983949565a67f3be6a00508
+checksum=ae71cadebff1e16991c48fcb9c71c177e2fc2d04536b89d1437587bcdae70617
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 6e689a4167ca0e21fc0cad3a8fdcfdab635c1b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:41 +0100
Subject: [PATCH 160/305] kcachegrind: update to 20.12.3.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 4c1f3081dfce..68c92d1033be 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=5c788e531d785126e0186585829b4d4f1f77fbbbe81a60e74f20e1ea3a249045
+checksum=95e18b85ae69a522f1f0047960c2dbcc2553af284d18b45d5373746a7e5f69ea
 python_version=2

From 837a69f98b2c2c27608a5d3fb8eab3976b86630a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:42 +0100
Subject: [PATCH 161/305] kcron: update to 20.12.3.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 54d60c87a2dc..ae834a7601cf 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=256d70a1bde74691900a2291d6a75d128490a3a4166f4491294504fa0f31aa08
+checksum=ee8276e91e35959c6ea795327957ed6a218a59ac0912aac3a3cbc5f5abafc54a

From 4500cb8c0e8d7bc1507fbcc5b59f5de4d5c43665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:43 +0100
Subject: [PATCH 162/305] kdialog: update to 20.12.3.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 42bfbc8054de..e0a4a3b03b3e 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=ad8b87d6c92821de027cabb4ac242536ecc0d0b43550dc9f14503c7c3b755eec
+checksum=231f6735e5905e92381da835da1b90bddb8ada39d8bffd90c8d2f9a3673602de

From 13bfb0a4795f081a3c4e6bba85da4e65059c92b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:44 +0100
Subject: [PATCH 163/305] keditbookmarks: update to 20.12.3.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index ce6b96bef224..d976cd270763 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=a7ad62388d8bf4ebce075abb270d8f7b283cd97a368293b6c895819a7750956a
+checksum=6823446698d80e6ce59601f1772ec316ad205954cac8be6381456f714c6dd759
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 5b741167917da88069c48d87298eafede2839fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:45 +0100
Subject: [PATCH 164/305] kfind: update to 20.12.3.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index d18b0b40baa3..a74ffe9109ff 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=cb329fa0aefc42afe1176e646e506ac566efa7e134ae173e690733cb6f2cd16d
+checksum=e6f608fcd717021bc2f4c69def81f18361c05abb72503deb268d219fb8a6f167

From 9f31267c319e62007c4ff439f8c6e645c6ab29d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:46 +0100
Subject: [PATCH 165/305] kig: update to 20.12.3.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index aebe2b3ec2c3..5a4bf8f150d7 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=3fcff749073feb233cb2b25679d42c5776e5578ee43bb03091c27d98a77f9b23
+checksum=ce3261eb10e052fa10fcb3742d6a1820006bfa100f5aaae09f367acac3019ed9

From e8361604ff7f7cf474472a95e3f928575bb5f346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:47 +0100
Subject: [PATCH 166/305] kio-gdrive: update to 20.12.3.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 8d345369230f..95fa01678436 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=758a8d2b61537a58a968b67ca5318ea70370bd04c2806c7baf7625abe1549c67
+checksum=4569cc07681aa88a81bda7923c795916cc6d1578859e11f0bb336699db8f7b70

From 27a57803b56d8c129af7cfe8a4655deb34a24c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:48 +0100
Subject: [PATCH 167/305] kmag: update to 20.12.3.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index df43caa315af..80dd3ad29b1d 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=dbe79175edcc1d4d20969b6ddb8953e0a51f11be586b7dda68034fc4862d96ef
+checksum=32932eb791d76de88de93a04f71f1224c41f0e33eb87b84eeab55668a18961dc

From c07186ead1baf7de4c3ea401c4c87d3c6b2400ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:49 +0100
Subject: [PATCH 168/305] kmix: update to 20.12.3.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index c510456a6c80..7d2aebd41a18 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=b33bfe899bf36729f64a9f3a42b8bf48a49b745afc8af15638dd2f2a7c90718a
+checksum=68f892958eec984685567ad36624084118b6dc5e7a4633733a6c3e6aea34ea17

From b742fcf20bb9369acf25e3452edec1cdd881f5d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:50 +0100
Subject: [PATCH 169/305] kolourpaint: update to 20.12.3.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 1db4466b7816..515eb3004375 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d699f2e56234eda8787c9ddc20904248cc87c7c4468d9e6254fc659c7202eb8e
+checksum=2f947803698f8169891191cb6ff841d3e991f9ae7157469cf01f4af594bde93e
 
 post_install() {
 	vlicense COPYING

From ef661b5f1d0f0ee5b19199dadfa6c23781a29e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:51 +0100
Subject: [PATCH 170/305] kompare: update to 20.12.3.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index eb68b4bec250..3178f0531cfb 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=bbf60a63fb1b8ac89191ab18d3eb437e9da2ee8fb460b1fc5b95f3290ad7c5a2
+checksum=7b57eddfa2c8f232252d4e981359fbe7844050aa2707d95044646d917967fb7f

From bb1abf9754dbe84ba0c6417f0cf1e77ba846f7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:52 +0100
Subject: [PATCH 171/305] kpat: update to 20.12.3.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index a7a681fb2eba..ca73073f74bd 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=dd7a168ed23410d9306a24fc0b80c037764be39e70a635477f8c2fa506199bbd
+checksum=21d802097e8891d7655407a56a42a79107a4002096a2a3ea26b0ac0ee8fe34ec
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 4e7160d3d508db66f5db6cf091e510e21e46e76c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:53 +0100
Subject: [PATCH 172/305] kruler: update to 20.12.3.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 7e5714b7219d..571083d96a7e 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=4a26ebf5739c1f863c408e03e8f6737aff9254ff64bf557ea9431cb295835e75
+checksum=3f7152398f31f7315be5b504d9bb55e11358ab5cee8303e6b406d8f686836fdb

From 6c40d720277bd94d6ca9d5aa6ceac51fae7e83c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:54 +0100
Subject: [PATCH 173/305] ksystemlog: update to 20.12.3.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 076160e3dbb9..3364a48d7be4 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=8751b926e271c1fcce858de7ac535eab59af56eabee6a834c2e5de58e6bcd9bb
+checksum=1e3fa2a9e2c9f995ce8aea028ca68ba2487db7212ad298d9d2d7fa98710cf0eb
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From bc3472e86e5e9097b21ad0362c02aa7249d8f517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:55 +0100
Subject: [PATCH 174/305] kteatime: update to 20.12.3.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 61a49d390693..5e34401f5c86 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2d22abb604e7dc4024c049eac866fa4cce19d09e390cadb130adb2fcd4b637a3
+checksum=f016698e891688f9fbec934b3b66021e49aa05b699920171c57758273b622cf9

From 828a9ebb8ead0a135859d163b34cf163efb6febe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:56 +0100
Subject: [PATCH 175/305] kturtle: update to 20.12.3.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index ddf72e8cd12b..272021b4c219 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=20432e903bc20e832d921019215d1307a561243ef7369ed0a1e95979a46186a8
+checksum=e6bedbae45faf41158b2dab80229c69f8490698cb35afcb3507b9db2668ab89e

From 6e168cb30232533282956f551cb192e2a8120dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:57 +0100
Subject: [PATCH 176/305] kwalletmanager: update to 20.12.3.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index b785d8a24134..3264711f87d2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3c76f5c4a62b8ad1cab6532537120e5b4a4dca936b68d3a97ef10283ce1d9d0a
+checksum=995414a017735a0dedf19bffdc715cc0f526925b597bba9aa7f5d34e97059d9a

From 040c12769d293aaa0d54c69b9461eefcda11e195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:13:59 +0100
Subject: [PATCH 177/305] libkcddb: update to 20.12.3.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8e31f9dbca18..6b68669db59c 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=13a95d83e61f664ff35b99f9942442c3a443f4ed0f57652756fdfa72d863a7df
+checksum=206229847e0fdde6d1cb36c7be87bd81e7723dd4774d06a872279a4b4390ee54
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 16fb4d815b9ab695f448dce2c27349aef483104a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:14:00 +0100
Subject: [PATCH 178/305] libkomparediff2: update to 20.12.3.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index e58db295bb2b..1c52bb2a33ef 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=a98555dd0a8ee86c08db3f0f20d50de0f4f82e77e7ba2fcf643b7e88031dd60d
+checksum=8386c5108fd761aa5b4b8dbd25f36b021c0bf3a42127e41916c8cd646b99c35f
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f1e19efa30e995480261f42395726665c1c5336b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:14:01 +0100
Subject: [PATCH 179/305] marble5: update to 20.12.3.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 94ecb8371e6c..38d2b43fef46 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=20.12.2
+version=20.12.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=420ddc73a34bd2ed4ac6c6bde3cd05c7ea2dc05f20b1b2457a167a54bae6f14d
+checksum=57b1b129dd0301c124ab5f930af9dfe044cedfcd42a6b180c6cf3c594fba7bc2
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From d69f3b6d2f992e2450a5db142546b7a9e188e5e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:14:02 +0100
Subject: [PATCH 180/305] signon-kwallet-extension: update to 20.12.3.

---
 srcpkgs/signon-kwallet-extension/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index a3f4183b88f0..0d25c1caada5 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=37f52bdd8f6378cd92beecf48bc42993839ac18c1d3f100a6ba1dc856c039979
+checksum=d7b308fc800445cbcd4cec30a0997d8a10fcd23db69c8d49d6436aa3dedcf0a8

From 5ee0971b4a2f441633d7664307aa01963f9c1341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:14:03 +0100
Subject: [PATCH 181/305] svgpart: update to 20.12.3.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 4afcdd7dabb3..d14b83ea39f8 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=923fea513a1e95033d9ed02ca6884aa978a1b6424d4961d69e2fa1f5746938ec
+checksum=f4b588f4b29178fd03a63c2b005837629bf9bbcf59f0a80fffa6a2354ff3b3d1

From 29de685ffe9cb949c8d4353a6a53e7fd5b51394e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:14:04 +0100
Subject: [PATCH 182/305] umbrello: update to 20.12.3.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9646350471f0..cee0fe295258 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=4e4fdc0cbff6d578d6e2510c186a27e402995d35265ac203e100e6950c61f17f
+checksum=57fb7d988e115be18514f807bab483a19877acc3f1910aeb952c4d8372f4d378
 python_version=2
 
 pre_configure() {

From 6e89c7e396d46af9997428f2db41d25f0a436f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 16 Mar 2021 22:14:05 +0100
Subject: [PATCH 183/305] yakuake: update to 20.12.3.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index ca369503b3ca..4fc0179ba8d7 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=c4664a037ba01e25665720cbb540a09586909e0557ed4c4fb6cabb6e68ff399a
+checksum=7ddd1a47fdd3af67be16ae40182bea97f7c004448391ac52737d3e5f2e0b25f8

From 2187c9537fe72b04817301685f16f2e90880ca5e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 20 Mar 2021 18:54:23 +0100
Subject: [PATCH 184/305] linux5.10: update to 5.10.25.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6d014ade30b8..e3735ef3f319 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.24
+version=5.10.25
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=c6dcd04e5893c5d68b637188f904528e91f28d790cd49cf8a7fb817423bd763f
+checksum=930ae76b9a3b64b98802849aca332d17a706f20595de21e1ae729b55ee461add
 python_version=3
 patch_args="-Np1"
 

From f74eec585cdbdb6591b6b76afa9d379bdd25c1ba Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 13:00:44 +0100
Subject: [PATCH 185/305] mutagen: split package

---
 srcpkgs/python3-mutagen          |  1 -
 srcpkgs/python3-mutagen/template | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 delete mode 120000 srcpkgs/python3-mutagen
 create mode 100644 srcpkgs/python3-mutagen/template

diff --git a/srcpkgs/python3-mutagen b/srcpkgs/python3-mutagen
deleted file mode 120000
index 7e10650b42d6..000000000000
--- a/srcpkgs/python3-mutagen
+++ /dev/null
@@ -1 +0,0 @@
-mutagen
\ No newline at end of file
diff --git a/srcpkgs/python3-mutagen/template b/srcpkgs/python3-mutagen/template
new file mode 100644
index 000000000000..6e069c3de349
--- /dev/null
+++ b/srcpkgs/python3-mutagen/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-mutagen'
+pkgname=python3-mutagen
+version=1.45.1
+revision=1
+wrksrc="mutagen-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="$hostmakedepends"
+depends="python3"
+checkdepends="python3-flake8 python3-hypothesis python3-pytest"
+short_desc="Python3 multimedia tagging library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/quodlibet/mutagen"
+changelog="https://raw.githubusercontent.com/quodlibet/mutagen/master/NEWS"
+distfiles="${PYPI_SITE}/m/mutagen/mutagen-${version}.tar.gz"
+checksum=6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1

From e353e5f4884c022f9bd1f77a9e717204f597cf48 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 13:01:03 +0100
Subject: [PATCH 186/305] mutagen: remove package

---
 srcpkgs/mutagen/template          | 49 -------------------------------
 srcpkgs/removed-packages/template |  3 +-
 2 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/mutagen/template

diff --git a/srcpkgs/mutagen/template b/srcpkgs/mutagen/template
deleted file mode 100644
index 552fecc0a505..000000000000
--- a/srcpkgs/mutagen/template
+++ /dev/null
@@ -1,49 +0,0 @@
-# Template file for 'mutagen'
-pkgname=mutagen
-version=1.43.0
-revision=3
-build_style=python-module
-pycompile_module="mutagen"
-hostmakedepends="python-devel python-setuptools python3-devel
- python3-setuptools"
-makedepends="$hostmakedepends"
-depends="python"
-short_desc="Python2 multimedia tagging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/quodlibet/mutagen"
-changelog="https://raw.githubusercontent.com/quodlibet/mutagen/master/NEWS"
-distfiles="${PYPI_SITE}/m/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3a982d39f1b800520a32afdebe3543f972e83a6ddd0c0198739a161ee705b588
-
-alternatives="
- mutagen:mid3cp:/usr/bin/mid3cp2
- mutagen:mid3iconv:/usr/bin/mid3iconv2
- mutagen:mid3v2:/usr/bin/python2-mid3v2
- mutagen:moggsplit:/usr/bin/moggsplit2
- mutagen:mutagen-inspect:/usr/bin/mutagen-inspect2
- mutagen:mutagen-pony:/usr/bin/mutagen-pony2"
-
-post_install() {
-	# XXX: override the default naming scheme for mid3v2
-	cp -a ${DESTDIR}/usr/bin/{,python3-}mid3v2
-	mv ${DESTDIR}/usr/bin/{,python2-}mid3v2
-}
-
-python3-mutagen_package() {
-	alternatives="
-	 mutagen:mid3cp:/usr/bin/mid3cp3
-	 mutagen:mid3iconv:/usr/bin/mid3iconv3
-	 mutagen:mid3v2:/usr/bin/python3-mid3v2
-	 mutagen:moggsplit:/usr/bin/moggsplit3
-	 mutagen:mutagen-inspect:/usr/bin/mutagen-inspect3
-	 mutagen:mutagen-pony:/usr/bin/mutagen-pony3"
-	depends="python3"
-	pycompile_module="mutagen"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/bin/python3-*
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0ff38b79c6ff..e114ab3bedee 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=36
+revision=37
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -186,6 +186,7 @@ replaces="
  mirrorbits<=0.5.1_1
  mongroup<=0.4.1_2
  mozjs68<=68.11.0_1
+ mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
  oce<=0.18.3_1

From 8daa06a144c77494011196f3ab4f85815ec41b43 Mon Sep 17 00:00:00 2001
From: Duje Mihanovic <mihaduje@pm.me>
Date: Thu, 11 Mar 2021 14:37:19 +0100
Subject: [PATCH 187/305] New package: python3-rx-3.1.1

---
 srcpkgs/python3-rx/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-rx/template

diff --git a/srcpkgs/python3-rx/template b/srcpkgs/python3-rx/template
new file mode 100644
index 000000000000..202151531f5a
--- /dev/null
+++ b/srcpkgs/python3-rx/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-rx'
+pkgname=python3-rx
+version=3.1.1
+revision=1
+wrksrc="RxPY-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-pytest"
+depends="python3 python3-pytest"
+checkdepends="python3-gobject python3-gobject-devel gtk+3-devel"
+short_desc="Reactive Extensions for Python"
+maintainer="Duje Mihanovic <mihaduje@pm.me>"
+license="MIT"
+homepage="https://rxpy.rtfd.io/"
+distfiles="https://github.com/ReactiveX/RxPY/archive/v${version}.tar.gz"
+checksum=3afd4dbd7c21467637adeb9d34d46b2f5c6f73f7a73711c24c376f8acce2bab3
+
+post_install() {
+	vlicense LICENSE
+}

From 7177de220f05ab0f1be7a31cb39e882873b90b22 Mon Sep 17 00:00:00 2001
From: Duje Mihanovic <mihaduje@pm.me>
Date: Thu, 11 Mar 2021 14:36:51 +0100
Subject: [PATCH 188/305] New package: python3-nvml-0.2.4

---
 srcpkgs/python3-nvml/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-nvml/template

diff --git a/srcpkgs/python3-nvml/template b/srcpkgs/python3-nvml/template
new file mode 100644
index 000000000000..fa61e05e862f
--- /dev/null
+++ b/srcpkgs/python3-nvml/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-nvml'
+pkgname=python3-nvml
+version=0.2.4
+revision=1
+wrksrc="py3nvml-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-xmltodict"
+short_desc="Python bindings for NVML library"
+maintainer="Duje Mihanovic <mihaduje@pm.me>"
+license="BSD-3-Clause"
+homepage="https://github.com/fbcotter/py3nvml"
+distfiles="https://github.com/fbcotter/py3nvml/archive/${version}.tar.gz"
+checksum=936ea2ce7e40becca2ef578e58c35dbec4d992def42518b73ca2c9833af1dc35
+
+post_install() {
+	vlicense LICENSE
+}

From fc49fb5ce9d817e2367a2bdba108cedc7174d433 Mon Sep 17 00:00:00 2001
From: Duje Mihanovic <mihaduje@pm.me>
Date: Thu, 11 Mar 2021 14:36:15 +0100
Subject: [PATCH 189/305] New package: python3-injector-0.18.4

---
 srcpkgs/python3-injector/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-injector/template

diff --git a/srcpkgs/python3-injector/template b/srcpkgs/python3-injector/template
new file mode 100644
index 000000000000..cc43c1e60123
--- /dev/null
+++ b/srcpkgs/python3-injector/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-injector'
+pkgname=python3-injector
+version=0.18.4
+revision=1
+wrksrc="injector-${version}"
+build_style=python3-module
+hostmakedepends="python3-typing_extensions python3-setuptools"
+depends="python3 python3-typing_extensions"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python dependency injection framework"
+maintainer="Duje Mihanovic <mihaduje@pm.me>"
+license="BSD-3-Clause"
+homepage="https://github.com/alecthomas/injector"
+distfiles="https://github.com/alecthomas/injector/archive/${version}.tar.gz"
+checksum=9f00f16bb667142a076073af0df2c30013b1fc4c032c49029ad2f9bcba88d3b9
+
+post_install() {
+	vlicense COPYING
+}

From 73033d5cd55bc79660b79ed97608be458be95a27 Mon Sep 17 00:00:00 2001
From: Duje Mihanovic <mihaduje@pm.me>
Date: Thu, 11 Mar 2021 14:35:53 +0100
Subject: [PATCH 190/305] New package: python3-coveralls-2.9.2

---
 srcpkgs/python3-coveralls/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-coveralls/template

diff --git a/srcpkgs/python3-coveralls/template b/srcpkgs/python3-coveralls/template
new file mode 100644
index 000000000000..36f22c017398
--- /dev/null
+++ b/srcpkgs/python3-coveralls/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-coveralls'
+pkgname=python3-coveralls
+version=2.9.2
+revision=1
+wrksrc="python-coveralls-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-coverage"
+depends="python3"
+short_desc="Python API for coveralls.io"
+maintainer="Duje Mihanovic <mihaduje@pm.me>"
+license="Apache-2.0"
+homepage="https://github.com/z4r/python-coveralls"
+distfiles="https://github.com/z4r/python-coveralls/archive/${version}.tar.gz"
+checksum=15274d667c4ac3642db30e59bf1eb3f15decd7afc139f68737dc0c003d7d31e8
+make_check=no # requires pytest-pep8 and httpretty

From e294c10a763118b27d38b03625f8e049078aa26c Mon Sep 17 00:00:00 2001
From: Duje Mihanovic <mihaduje@pm.me>
Date: Thu, 11 Mar 2021 14:35:28 +0100
Subject: [PATCH 191/305] New package: gwe-0.15.2

---
 srcpkgs/gwe/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/gwe/template

diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
new file mode 100644
index 000000000000..6a64fd01e6ce
--- /dev/null
+++ b/srcpkgs/gwe/template
@@ -0,0 +1,21 @@
+# Template file for 'gwe'
+pkgname=gwe
+version=0.15.2
+revision=1
+wrksrc="gwe-${version}"
+build_style=meson
+hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
+ python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
+ python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
+ python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
+makedepends="gobject-introspection appstream-glib"
+depends="python3 gobject-introspection libappindicator libdazzle python3-matplotlib
+ python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
+ python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
+ python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
+short_desc="Utility for overclocking NVIDIA cards"
+maintainer="Duje Mihanovic <mihaduje@pm.me>"
+license="GPL-3.0-or-later"
+homepage="https://www.gitlab.com/leinardi/gwe"
+distfiles="https://gitlab.com/leinardi/gwe/-/archive/${version}/gwe-${version}.tar.gz"
+checksum=a827eeb8f18fd08213fb22e0e1ef6437ea749eb4b34fcea9d0ae5282912753a0

From fe9569c339341fd63e31d08655d1a0267332de55 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 20 Mar 2021 19:03:41 +0200
Subject: [PATCH 192/305] opera: update to 74.0.3911.75.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 136b504e8147..d709282efc79 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=73.0.3856.344
+version=74.0.3911.75
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=70cd10eb8fc4a2930571692aec9dcd2a8d52b23599a9c90b39578827e7df31f9
+checksum=358e125db7e27e85582263c3ffa94a5c12c0b90c05e1811937a5e50276ecd83d
 repository="nonfree"
 nostrip=yes
 

From edabcd3e95965d5aad2f12a7fccc311492e85ccd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 20 Mar 2021 19:17:45 +0200
Subject: [PATCH 193/305] yaru: update to 21.04.1.

---
 srcpkgs/yaru/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template
index d1dda8b1cdeb..44578003b724 100644
--- a/srcpkgs/yaru/template
+++ b/srcpkgs/yaru/template
@@ -1,6 +1,6 @@
 # Template file for 'yaru'
 pkgname=yaru
-version=20.10.6.1
+version=21.04.1
 revision=1
 build_style=meson
 hostmakedepends="glib-devel sassc pkg-config"
@@ -10,4 +10,4 @@ maintainer="Dawid Potocki <dpot@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/ubuntu/yaru"
 distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz"
-checksum=d28fda9bf15ec920b2b2b622c3cf5e64973bccc4c97a0fda477f402e3e049b0b
+checksum=8cbbb1fcc7fa1e46e48d870cc1f941069e8213ac53200001aa9548ad79086836

From 40baff6f5446b048ed7805e77583ecef424dc088 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 12 Mar 2021 22:41:28 +0000
Subject: [PATCH 194/305] caerbannog: add missing python3-gpg dependency

---
 srcpkgs/caerbannog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/caerbannog/template b/srcpkgs/caerbannog/template
index 3366b3350adf..0ef6b9c6feca 100644
--- a/srcpkgs/caerbannog/template
+++ b/srcpkgs/caerbannog/template
@@ -1,10 +1,10 @@
 # Template file for 'caerbannog'
 pkgname=caerbannog
 version=0.3
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel"
-depends="libhandy1 libnotify python3-anytree python3-gobject python3-fuzzyfinder"
+depends="libhandy1 libnotify python3-anytree python3-gpg python3-gobject python3-fuzzyfinder"
 short_desc="Frontend for password-store"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-or-later"

From 052dfae59b378a180bf415746fae64b3929e226d Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 20 Mar 2021 23:51:12 +0100
Subject: [PATCH 195/305] pvoc: fix typo

---
 srcpkgs/pvoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pvoc/template b/srcpkgs/pvoc/template
index 6d0c598a9916..da23784124aa 100644
--- a/srcpkgs/pvoc/template
+++ b/srcpkgs/pvoc/template
@@ -1,12 +1,12 @@
 # Template file for 'pvoc'
 pkgname=pvoc
 version=0.1.12
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="ladspa-sdk fftw-devel libsndfile-devel"
-short_desc="LADSPLA plugins and a tool for time compression/expansion"
+short_desc="LADSPA plugins and a tool for time compression/expansion"
 maintainer="Olga Ustuzhanina <me@laserbat.pw>"
 license="GPL-2.0-or-later"
 homepage="http://quitte.de/dsp/pvoc.html"

From 394b8695a7b250cd06eb7f92b8e60491e67fbc09 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:04:09 +0100
Subject: [PATCH 196/305] haproxy: update to 2.3.7.

---
 srcpkgs/haproxy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index ff5411c3422b..eddfaf0fca0a 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.3.5
-revision=2
+version=2.3.7
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=7924539530bbf555829c7f5886be0b7fcf8d9c8ffe0867b7010beb670abfbe4b
+checksum=31ba7acd0d78367c71b56e4a87c9f11cd235fc5602bc5b84690779120e0a305b
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From 37f0159cf63a776dc074eaa6f6707c206ceee58b Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 20 Mar 2021 18:36:21 +0100
Subject: [PATCH 197/305] hcloud: update to 1.21.1.

---
 srcpkgs/hcloud/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 8a7aecc25041..d50726090832 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.20.0
+version=1.21.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=116089f671f3f484b45fa8264cd016f92246421ba8c444a98d5bc18741e625e5
+checksum=0c76bd22e0891f4073b73d16fe233ab704fe5c0cf539f091d20d2e43ccbc5a1b
 
 post_install() {
 	vlicense LICENSE

From 864d7faba0e9a61a6398da46ec5216e5b3107892 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 20 Mar 2021 18:32:55 +0100
Subject: [PATCH 198/305] minio: update to 2021.03.17.

---
 srcpkgs/minio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 0088d179f280..73da4693e43c 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2021.03.01
+version=2021.03.17
 revision=1
-_version="${version//./-}T04-20-55Z"
+_version="${version//./-}T02-33-02Z"
 wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/minio/minio"
 distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz"
-checksum=516b51d036cc0f599feb3a24c33142c7adf16aa15cc6ed5d0fddef1fde5bceeb
+checksum=e94b099fc84699aa68f0cfecde34f1da848be43023cae5d687729fb1de96b1fe
 system_accounts="_minio"
 _minio_homedir="/var/lib/minio"
 _minio_descr="Minio Daemon User"

From 3b1200f975279b81ed4087d9f0cf1b724e266215 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 16:36:44 +0100
Subject: [PATCH 199/305] adriconf: update to 2.4.1.

---
 srcpkgs/adriconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/adriconf/template b/srcpkgs/adriconf/template
index 3c2824f5485a..9716758fb36e 100644
--- a/srcpkgs/adriconf/template
+++ b/srcpkgs/adriconf/template
@@ -1,6 +1,6 @@
 # Template file for 'adriconf'
 pkgname=adriconf
-version=2.4
+version=2.4.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/mesa/adriconf/"
 distfiles="https://gitlab.freedesktop.org/mesa/adriconf/-/archive/v${version}/adriconf-v${version}.tar.gz"
-checksum=f5c35d2e4eb177ace18d413bc58fd1fb7e7a5e35a2256b2982b33f67ad998ce0
+checksum=a0b6d9c2165cde5a1753fe7885246fbd17e51a768c88bc5b14ab83ac61d869f7

From 1b3e61135daf33e56dc664326b261e3523ba025a Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:43:06 +0100
Subject: [PATCH 200/305] rng-tools: update to 6.12.

---
 srcpkgs/rng-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index bfc01d1b2201..a6e67902ba89 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'rng-tools'
 pkgname=rng-tools
-version=6.11
-revision=3
+version=6.12
+revision=1
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/nhorman/rng-tools"
 distfiles="https://github.com/nhorman/rng-tools/archive/v${version}.tar.gz"
-checksum=644d8bd4e84cee29debddc7e6db72aff27e628e5a879ce310562edf50f12be41
+checksum=6fd5b52a700edec85eb1043970e22e8e2ad06a4b43851f35d33d90e09570e9d3
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From c5e6b49aef5abe67db063b3a5c8575368160ea2e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:46:10 +0100
Subject: [PATCH 201/305] tinyssh: update to 20210319.

Closes: #29620 [via git-merge-pr]
---
 srcpkgs/tinyssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 4eee299b885e..0283f890bcd7 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,6 +1,6 @@
 # Template file for 'tinyssh'
 pkgname=tinyssh
-version=20190101
+version=20210319
 revision=1
 build_style=gnu-makefile
 make_dirs="/etc/tinyssh 0755 root root"
@@ -10,7 +10,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="Public Domain"
 homepage="https://tinyssh.org"
 distfiles="https://github.com/janmojzis/tinyssh/archive/${version}.tar.gz"
-checksum=554a9a94e53b370f0cd0c5fbbd322c34d1f695cbcea6a6a32dcb8c9f595b3fea
+checksum=dfa1f18a1cda03fda93b7659949377b40dee4e2f74e14db38eb146e5bc959c8d
 nocross=yes
 
 pre_build() {

From 482ccfad019de569a76b7c66de336b8bba809ce8 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 13:26:48 +0100
Subject: [PATCH 202/305] zinnia: fix template

---
 srcpkgs/zinnia/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zinnia/template b/srcpkgs/zinnia/template
index 88e777081312..fc0f6a2a5a6b 100644
--- a/srcpkgs/zinnia/template
+++ b/srcpkgs/zinnia/template
@@ -2,13 +2,13 @@
 pkgname=zinnia
 version=0.06
 revision=1
-short_desc="OCR system for hand-written input"
-maintainer="Matthias von Faber <mvf@gmx.eu>"
-homepage="http://taku910.github.io/zinnia/"
-license="2-clause-BSD"
 build_style=gnu-configure
 hostmakedepends="libtool pkg-config"
 makedepends="libtool pkg-config"
+short_desc="OCR system for hand-written input"
+maintainer="Matthias von Faber <mvf@gmx.eu>"
+license="BSD-2-Clause"
+homepage="https://taku910.github.io/zinnia/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
 checksum=ece3af93f937282971634fd81d3e997f848e8cfa958220e26a4564ca064ac20b
 

From 64c2faa181b3d81455affd602add7f917a35f22f Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:01:03 +0100
Subject: [PATCH 203/305] fetchmail: update to 6.4.17.

---
 srcpkgs/fetchmail/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a5afbb3c3b4a..be26641609a7 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,7 +1,7 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.16
-revision=2
+version=6.4.17
+revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=044b9a0ac03afbae7744979defe3e2e32e39141bca68fd0c8deda2ed40884fb9
+checksum=a41bcdf11b41aa0682b259aee4717c617c15dadd43fa008b2ed38b770f4d50c6
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From 3e74f9bc7225e9951a28dbeca5b554672cb03919 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Mar 2021 22:29:28 -0400
Subject: [PATCH 204/305] python3-hypothesis: update to 6.8.1.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 7d4aeac554c8..8ae7e8d2d1d3 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.8.0
+version=6.8.1
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=91b92c9d74ca1dbfab0f4e7d670975c9cc069767fcc7bdbcd377fed0560601e8
+checksum=4f1f45ab866baa9c25386dfafc31f128dc53874e81a6ea202e7e53c15a14afb7
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 1c68de179276f65258cbcb9ed6e2054d80f49b05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Mar 2021 22:29:36 -0400
Subject: [PATCH 205/305] goimapnotify: update to 2.1.

---
 srcpkgs/goimapnotify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 2c045c337fdc..4b4f63af9b9b 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,6 +1,6 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
-version=2.0
+version=2.1
 revision=1
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
@@ -11,4 +11,4 @@ license="GPL-3.0-only"
 homepage="https://gitlab.com/shackra/goimapnotify"
 changelog="https://gitlab.com/shackra/goimapnotify/blob/master/CHANGELOG.rst"
 distfiles="https://${go_import_path}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=175734cdc3fad285479f4bbad761fe2a379f33e4919572efaf41c8107d249cd9
+checksum=61de26813671abcea5026cafd8d2acd12ee6913c661adcdf685f61d7cc6ded82

From f81b790674c75bf004ce1ff8431808e1acdd8c02 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Mar 2021 22:32:09 -0400
Subject: [PATCH 206/305] python3-pyopencl: update to 2021.1.4.

---
 srcpkgs/python3-pyopencl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 8c7e13fbee2a..3a1d79ac75bb 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2021.1.3
+version=2021.1.4
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=a428683690f66383cb59c675c2991ced45f0c9b722373e53a643c1b75de89c12
+checksum=6a9665e89c15e1c684789263bd3a632567e7c7bd25a657092df4b185b3468971
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From 900deed9a0e79623f7ef535955defd971c5d719c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Mar 2021 22:38:11 -0400
Subject: [PATCH 207/305] python3-setuptools_scm: update to 6.0.1.

---
 srcpkgs/python3-setuptools_scm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools_scm/template b/srcpkgs/python3-setuptools_scm/template
index c1b46ed73d1d..cb74f37dd5f4 100644
--- a/srcpkgs/python3-setuptools_scm/template
+++ b/srcpkgs/python3-setuptools_scm/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools_scm'
 pkgname=python3-setuptools_scm
-version=5.0.2
+version=6.0.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/pypa/setuptools_scm"
 distfiles="${PYPI_SITE}/s/setuptools_scm/setuptools_scm-${version}.tar.gz"
-checksum=83a0cedd3449e3946307811a4c7b9d89c4b5fd464a2fb5eeccd0a5bb158ae5c8
+checksum=d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92
 
 post_install() {
 	vlicense LICENSE

From ec482aa69c4c7ddd4da86ac0e3eefaa6036b36cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Mar 2021 22:44:38 -0400
Subject: [PATCH 208/305] python3-tifffile: update to 2021.3.17.

---
 srcpkgs/python3-tifffile/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 7f5b99d8aff2..b4b4f3673988 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,19 +1,20 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.3.5
+version=2021.3.17
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-numpy"
-checkdepends="${depends} python3-pytest python3-lxml"
 short_desc="Read and write TIFF files"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0428401dc72ff6f3ea0d21ea2f7d728f854521cb7a895c4056dbbfb3b6227e14
+checksum=dd21b981a0d42f4847de5bd4e52a00c0718fdf8a26d1cb5c00a6d678e6d1e779
+# Tests require unpackaged fsspec
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 2bb2566ef231362d47f62efff0e8413750f02072 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Mar 2021 22:46:17 -0400
Subject: [PATCH 209/305] grpc: update to 1.36.4.

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index b28e2cba73dc..97014392bc9f 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.36.2
+version=1.36.4
 revision=1
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="51403542b19e9ed5d3b6551ce4a828e17883a1593d4ca408b098f04b0767d202
+checksum="8eb9d86649c4d4a7df790226df28f081b97a62bf12c5c5fe9b5d31a29cd6541a
  62c27e7a633e965a2f40ff16b487c3b778eae440bab64cad83b34ef1cbe3aa93"
 
 if [ "$CROSS_BUILD" ]; then

From b0de2dcf89aaff7bf98e9783a727e29471d2585d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Mar 2021 23:09:17 -0400
Subject: [PATCH 210/305] python3-adblock: update to 0.4.3.

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index 91ffd8811059..9c01559bc98d 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
-version=0.4.2
-revision=2
+version=0.4.3
+revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
@@ -14,8 +14,9 @@ short_desc="Brave's adblock library in Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/ArniDagur/python-adblock"
+changelog="https://raw.githubusercontent.com/ArniDagur/python-adblock/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=06de6074e6cfe889fc0383cc929a5a2306570251c14e51abbfcedd328b83e0e9
+checksum=42f00ff33338eed83c5880ae5f12c70e38154b78fceb19d2f447e86ae34e0f60
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="compiler throws SIGABRT on the psl crate" ;;

From 9a08a6820bba628c581f066b515eb7650e3b14d4 Mon Sep 17 00:00:00 2001
From: Vyivel <vyivel@posteo.net>
Date: Fri, 12 Mar 2021 18:04:14 +0300
Subject: [PATCH 211/305] New package: wayland-utils-1.0.0

---
 srcpkgs/wayland-utils/template | 17 +++++++++++++++++
 srcpkgs/wayland-utils/update   |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/wayland-utils/template
 create mode 100644 srcpkgs/wayland-utils/update

diff --git a/srcpkgs/wayland-utils/template b/srcpkgs/wayland-utils/template
new file mode 100644
index 000000000000..b3b9c3c4d644
--- /dev/null
+++ b/srcpkgs/wayland-utils/template
@@ -0,0 +1,17 @@
+# Template file for 'wayland-utils'
+pkgname=wayland-utils
+version=1.0.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols"
+short_desc="Wayland utilities"
+maintainer="Kirill Primak <vyivel@posteo.net>"
+license="MIT"
+homepage="https://wayland.freedesktop.org/"
+distfiles="https://wayland.freedesktop.org/releases/wayland-utils-${version}.tar.xz"
+checksum=64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/wayland-utils/update b/srcpkgs/wayland-utils/update
new file mode 100644
index 000000000000..61139fc2f1c1
--- /dev/null
+++ b/srcpkgs/wayland-utils/update
@@ -0,0 +1 @@
+site=https://wayland.freedesktop.org/releases.html

From db546ee86c1d2578d808e302cc74d302576f0a28 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:01:46 +0100
Subject: [PATCH 212/305] tig: update to 2.5.3.

---
 srcpkgs/tig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template
index 13df86e9feff..13d5166779ae 100644
--- a/srcpkgs/tig/template
+++ b/srcpkgs/tig/template
@@ -1,6 +1,6 @@
 # Template file for 'tig'
 pkgname=tig
-version=2.5.2
+version=2.5.3
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-2.0-only"
 homepage="https://jonas.github.io/tig/"
 distfiles="https://github.com/jonas/tig/archive/tig-${version}.tar.gz"
-checksum=f3dbd9eb2f80a5ba1218b197e1428e576d6110ea94a817f6d0984950f5780c29
+checksum=c2d6219c18ea33a92ac0691bdd528fcabea8529036858ef2b17726b838614343
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

From ce7b8848704a99eda79d0eaa5d52ea615a87862c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 20 Mar 2021 01:03:16 +0400
Subject: [PATCH 213/305] libcap: update to 2.49.

---
 srcpkgs/calibre/update  | 2 +-
 srcpkgs/libcap/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/calibre/update b/srcpkgs/calibre/update
index e46aadb2f383..ef61ea0d3b04 100644
--- a/srcpkgs/calibre/update
+++ b/srcpkgs/calibre/update
@@ -1,2 +1,2 @@
 site="https://github.com/kovidgoyal/calibre/tags"
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index a446d717a84a..0ca242c0cbe9 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.48
+version=2.49
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=4de9590ee09a87c282d558737ffb5b6175ccbfd26d580add10df44d0f047f6c2
+checksum=e98bc4d93645082ec787730b0fd1a712b38882465c505777de17c338831ee181
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From cf58488a3f598247866dc4e41c3a01c6054d339f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sun, 21 Mar 2021 16:46:59 +1100
Subject: [PATCH 214/305] ppp: fix prefix

---
 srcpkgs/ppp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 265de99e0753..8f597b56516f 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,7 +6,7 @@
 # When update this package
 pkgname=ppp
 version=2.4.9
-revision=1
+revision=2
 makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -27,7 +27,7 @@ conf_files="
  /etc/ppp/pap-secrets"
 
 do_configure() {
-	./configure --cc="${CC}" --cflags="${CFLAGS}"
+	./configure --prefix=/usr --cc="${CC}" --cflags="${CFLAGS}"
 }
 
 do_build() {

From 9091f04c1c6a5d6b835def89a0a050e71bbc9f68 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Mar 2021 13:18:54 +0100
Subject: [PATCH 215/305] bdf2psf: update to 1.202.

---
 srcpkgs/bdf2psf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
index bb70982e4ec6..314d83e905ee 100644
--- a/srcpkgs/bdf2psf/template
+++ b/srcpkgs/bdf2psf/template
@@ -1,6 +1,6 @@
 # Template file for 'bdf2psf'
 pkgname=bdf2psf
-version=1.201
+version=1.202
 revision=1
 wrksrc="console-setup-${version}"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/bdf2psf"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=a82e4b675bead927082945b977077510bc2c30d5ad33feb7026486ffb05fad0d
+checksum=c9b38d548337b26ffdc2bf555072e328bef8b7c1b2ac88cb4e24b898796cca20
 
 post_extract() {
 	sed -i '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf

From c2e4299090cc9c3cdda64538c4b74a12ab69e091 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Mar 2021 13:26:23 +0100
Subject: [PATCH 216/305] courier-unicode: update to 2.2.2.

---
 common/shlibs                    | 2 +-
 srcpkgs/courier-unicode/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..4b82c3ced654 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2757,7 +2757,7 @@ libmono-btls-shared.so mono-5.2.0.215_1
 libxcb-xrm.so.0 xcb-util-xrm-1.0_1
 libinchi.so.0 openbabel-2.3.2_1
 libopenbabel.so.5 openbabel-2.4.1_1
-libcourier-unicode.so.4 courier-unicode-2.0_1
+libcourier-unicode.so.7 courier-unicode-2.2.2_1
 libzstd.so.1 libzstd-1.0.0_1
 libudis86.so.0 udis86-1.7.2_4
 libsass.so.1 libsass-3.5.0_1
diff --git a/srcpkgs/courier-unicode/template b/srcpkgs/courier-unicode/template
index c7e8393005d8..f8a6ab39fef2 100644
--- a/srcpkgs/courier-unicode/template
+++ b/srcpkgs/courier-unicode/template
@@ -1,6 +1,6 @@
 # Template file for 'courier-unicode'
 pkgname=courier-unicode
-version=2.1.2
+version=2.2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.courier-mta.org/unicode/"
 distfiles="${SOURCEFORGE_SITE}/courier/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=9da4cfe5c14c635d815ef3e2b3f5f81887dc5bc873dffb19a64acf5c5f73c7cf
+checksum=9ed00e4b589259e81e09be6e21f24d6ba1159cdb5daa0ed722bebebb4c43fae1
 
 courier-unicode-devel_package() {
 	short_desc+=" - development files"

From 1aba7614b5cbd96ea33a0a5b69331640a3ac4dd0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Mar 2021 13:26:28 +0100
Subject: [PATCH 217/305] maildrop: update to 3.0.3.

---
 srcpkgs/maildrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maildrop/template b/srcpkgs/maildrop/template
index 45a0ece46ce4..64923e187810 100644
--- a/srcpkgs/maildrop/template
+++ b/srcpkgs/maildrop/template
@@ -1,6 +1,6 @@
 # Template file for 'maildrop'
 pkgname=maildrop
-version=3.0.2
+version=3.0.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-maildrop-uid= --enable-maildrop-gid=
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.courier-mta.org/maildrop/"
 distfiles="${SOURCEFORGE_SITE}/courier/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=0b53d93da9851e520d218dce07c94c79754893a2f80de1036eebaa85cb2bd597
+checksum=09dc17ec706d5d2a5bde9f67b37b8f5bf9a5b6a6d9ac1ca3bd0698c3f29bfc3d

From 77fc07cebe6c130fd53891dc5ee8e13b054f5c91 Mon Sep 17 00:00:00 2001
From: gt7-void <gt7@mail.com>
Date: Sun, 21 Mar 2021 01:07:12 -0300
Subject: [PATCH 218/305] openblas: choose generic target for x86 and x86_64.

The current template uses DYNAMIC_ARCH=1 to get multiple versions of some
functions to support different cpus. However, it will pick up the cpu it was
compiled in as a minimum requirement for the common code.

Adding TARGET=GENERIC fixes this, now the common code is compiled for a generic cpu.

See #29604 and https://github.com/xianyi/OpenBLAS/issues/3139.
---
 srcpkgs/openblas/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index ea5263838ccb..58a75941be47 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,7 +1,7 @@
 # Template file for 'openblas'
 pkgname=openblas
 version=0.3.13
-revision=2
+revision=3
 wrksrc="OpenBLAS-${version}"
 build_style=gnu-makefile
 make_build_args=" HOSTCC=gcc USE_OPENMP=1"
@@ -20,8 +20,8 @@ case "${XBPS_TARGET_MACHINE}" in
 	armv6*) make_build_args+=" TARGET=ARMV6" ;;
 	armv7*) make_build_args+=" TARGET=ARMV7" ;;
 	aarch64*) make_build_args+=" TARGET=ARMV8 DYNAMIC_ARCH=1" ;;
-	i686*) make_build_args+=" BINARY=32 DYNAMIC_ARCH=1" ;;
-	x86_64*) make_build_args+=" BINARY=64 DYNAMIC_ARCH=1" ;;
+	i686*) make_build_args+=" BINARY=32 TARGET=GENERIC DYNAMIC_ARCH=1" ;;
+	x86_64*) make_build_args+=" BINARY=64 TARGET=GENERIC DYNAMIC_ARCH=1" ;;
 	ppc64le*) make_build_args+=" TARGET=POWER8 DYNAMIC_ARCH=1" ;;
 	ppc64*) make_build_args+=" TARGET=PPC970MP" ;; # dynamic arch broken for <power6
 	ppc*) make_build_args+=" TARGET=PPCG4" ;;

From e06ef111e2f88df348bfc18e54ce1505f1259a7d Mon Sep 17 00:00:00 2001
From: Daxot <filohin.pavel@yandex.ru>
Date: Fri, 19 Mar 2021 18:01:03 +0300
Subject: [PATCH 219/305] nicotine+: update to 3.0.2

---
 srcpkgs/nicotine+/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index c24016f55ddc..fd1284c4a5f7 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,6 +1,6 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
-version=2.2.2
+version=3.0.2
 revision=1
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="doggone <doggone@airmail.cc>"
 license="GPL-3.0-or-later"
 homepage="https://nicotine-plus.org"
 distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz"
-checksum=a2734f11beb7ec4e32d1c8270b7328721b841830b22aed2db3c4acf2b66791bb
+checksum=a2a50a442e1dee035aa5825ef7b590c1c457bddba17e5a4abe6466113f5a4af1

From 4a668f28e15a131b24792295913d57633c908738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 15:14:51 +0100
Subject: [PATCH 220/305] cabal-install: pass makejobs to bootstrap.sh

---
 srcpkgs/cabal-install/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index f8b18f32cdb2..2c15789b1f9d 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -15,7 +15,7 @@ nopie_files="/usr/bin/cabal"
 nocross=yes
 
 do_build() {
-	PREFIX=$PWD/build sh bootstrap.sh --user
+	PREFIX=$PWD/build sh bootstrap.sh --jobs ${XBPS_MAKEJOBS} --user
 }
 do_install() {
 	vbin build/bin/cabal

From 2056fd086744729d5e4e511b2fa335651d2820fc Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 21 Mar 2021 16:31:07 +0100
Subject: [PATCH 221/305] linux5.4: update to 5.4.107.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index d114a30a300c..3d46e320dd43 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.106
+version=5.4.107
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=cc873b2c39c1823d4bc4f6cde527943c8cfd28ae94cb517804b0f9679359c8db
+checksum=1c3cef545f366b56332c11c28d074c9d9148c28059a970ec8710826652237560
 python_version=3
 patch_args="-Np1"
 

From f92633d25e1ae3c8bdfab79cb52e17b300616cb9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 21 Mar 2021 16:33:36 +0100
Subject: [PATCH 222/305] linux4.19: update to 4.19.182.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 0117501d4cba..aa1105c9992f 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.181
+version=4.19.182
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=5218ee33e92d9010e28d6cab62bf8c774a4f22d89747045920dc60fdd531a9cd
+checksum=05db750ba01ad557bef50835c253894fad9fb0db2224f0e803b25e2ff7ab2365
 python_version=2 #unverified
 patch_args="-Np1"
 

From 22ef9bd4f07ccb46dee8bd184b097f6a4bcfa3ef Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@JustinPC.fritz.box>
Date: Sat, 20 Mar 2021 04:59:23 +0100
Subject: [PATCH 223/305] New package: kleopatra:20.12.3

---
 srcpkgs/kleopatra/INSTALL.msg | 11 +++++++++++
 srcpkgs/kleopatra/template    | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/kleopatra/INSTALL.msg
 create mode 100644 srcpkgs/kleopatra/template

diff --git a/srcpkgs/kleopatra/INSTALL.msg b/srcpkgs/kleopatra/INSTALL.msg
new file mode 100644
index 000000000000..7e2a0f6c9eff
--- /dev/null
+++ b/srcpkgs/kleopatra/INSTALL.msg
@@ -0,0 +1,11 @@
+Kleopatra is using pinentry for entering passphrases.
+To avoid errors for key-generation, please install one of the following dependencies:
+
+	pinentry-qt (For QT - used by KDE desktops)
+	pinentry-gnome (Gnome)
+	pinentry-gtk2 (For GTK2 desktops)
+
+You have to set it as as default pinentry, for example:
+	echo "pinentry-program /usr/bin/pinentry-qt" > ~/.gnupg/gpg-agent.conf
+
+LogOut and LogIn your user again.
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
new file mode 100644
index 000000000000..2fbe963f3bdc
--- /dev/null
+++ b/srcpkgs/kleopatra/template
@@ -0,0 +1,20 @@
+# Template file for 'kleopatra'
+pkgname=kleopatra
+version=20.12.3
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
+makedepends="kcmutils-devel AppStream kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
+depends="gnupg2"
+checkdepends="dbus gnupg2"
+short_desc="Certificate Manager and Unified Crypto GUI"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
+homepage="https://www.kde.org/applications/utilities/kleopatra/"
+distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
+checksum="bf30f99bc6abd44d512ca8c53a7e81af625db72547a33df5c581101d787feaa0"
+
+do_check() {
+	QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
+		dbus-run-session ninja -C build test
+}

From c1f2d5449866cfa406265b2ebc279c946fe9529b Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sun, 21 Mar 2021 14:38:03 +0100
Subject: [PATCH 224/305] foot: update to 1.7.0.

---
 srcpkgs/foot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index f85ea5cfb24f..395f0bea6a60 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.6.4
+version=1.7.0
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/foot"
 changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=73142dcb7d0223ca740f880d372084b6dfdd56700c375709b3166bcaf32e034c
+checksum=a5a7405956fc1862638712606e502eba11f2561a77f3a9fbbb332f90c8b50ee4
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE

From 8e4a80852c30c3cc0571581ce1965d42b6adffc0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 21 Mar 2021 14:31:19 +0100
Subject: [PATCH 225/305] ptii: fix distfiles

---
 srcpkgs/ptii/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
index 4aab94cabdee..572d59daad4d 100644
--- a/srcpkgs/ptii/template
+++ b/srcpkgs/ptii/template
@@ -8,7 +8,7 @@ short_desc="Simple program you can use with ii"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="WTFPL"
 homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://repo.voidlinux.de/distfiles/ptii-${version}/ptii-${version}.tar.bz2"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
 checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
 
 LDFLAGS="-lpthread"

From 808bc1bcdbc8a8a436ebeefacb370039119bff35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 16:29:54 +0100
Subject: [PATCH 226/305] nodejs: update to 14.16.0.

---
 srcpkgs/nodejs/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index e89a169ad612..27eb39e7b4fe 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs'
 pkgname=nodejs
-version=14.15.4
+version=14.16.0
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -12,12 +12,13 @@ makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
  $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
+checkdepends="procps-ng"
 short_desc="Evented I/O for V8 javascript"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
+checksum=f6b904b06951de4c52089dd4456155d853e835b0dc4640f75458c6eb49f9e8ce
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
@@ -27,7 +28,7 @@ desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"
 desc_option_nghttp2="Enable shared nghttp2"
 desc_option_cares="Enable shared c-ares"
-build_options_default="libuv http_parser icu nghttp2 cares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
 
 replaces="iojs>=0"
 conflicts="nodejs-lts nodejs-lts-10"
@@ -100,6 +101,10 @@ do_build() {
 	fi
 }
 
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
 do_install() {
 	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
 	rm $DESTDIR/usr/include/node/openssl -rf

From decc2a9b1ff0517381b52bce13d33334f846be6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 19:10:43 +0100
Subject: [PATCH 227/305] llhttp: update to 2.2.1.

---
 srcpkgs/llhttp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 393892ad7692..c36e6e4f4f45 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,7 +4,7 @@
 # or at least a revbump in the same pull request since they work in-sync.
 
 pkgname=llhttp
-version=2.1.3
+version=2.2.1
 revision=1
 wrksrc="llhttp-release-v${version}"
 build_style=gnu-makefile
@@ -15,7 +15,7 @@ homepage="https://llhttp.org/"
 # _always_ use releases. Those have the C code generated, otherwise
 # we'd have a dep loop nodejs<->llhttp
 distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=5d0d0a96a97f74678dc03077488103ae72b04d142524525514ce774288849703
+checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
 
 post_extract() {
 	# No need to pull in gyp for such a simple Makefile...

From 82918a28b7601f14412dcb16c3276a1357800526 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 19:20:30 +0100
Subject: [PATCH 228/305] nodejs-lts: update to 12.21.0.

---
 srcpkgs/nodejs-lts/template | 11 ++++++++---
 srcpkgs/nodejs-lts/update   |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index edb108631ae4..7eca82bcacea 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.20.1
+version=12.21.0
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -12,12 +12,13 @@ makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
  $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
+checkdepends="procps-ng"
 short_desc="Evented I/O for V8 javascript"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
@@ -27,7 +28,7 @@ desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"
 desc_option_nghttp2="Enable shared nghttp2"
 desc_option_cares="Enable shared c-ares"
-build_options_default="libuv http_parser icu nghttp2 cares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
 
 replaces="iojs>=0"
 conflicts="nodejs nodejs-lts-10"
@@ -89,6 +90,10 @@ do_build() {
 	fi
 }
 
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
 do_install() {
 	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
 	rm $DESTDIR/usr/include/node/openssl -rf
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
index 85376d5582eb..537f8229dab9 100644
--- a/srcpkgs/nodejs-lts/update
+++ b/srcpkgs/nodejs-lts/update
@@ -1,2 +1,2 @@
 site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
+pattern='v\K12[\d.]+(?=\/)'

From 1a6f4e5fcf66f4ac74e8331ac1c7eb8e6ac5e2e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 19:28:20 +0100
Subject: [PATCH 229/305] nodejs-lts-10: update to 10.24.0.

---
 srcpkgs/nodejs-lts-10/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 0d28125a75f8..41a13c12d95a 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs-lts-10'
 pkgname=nodejs-lts-10
-version=10.23.1
+version=10.24.0
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
@@ -11,12 +11,13 @@ makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
  $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
 maintainer="k4leg <d0xi@inbox.ru>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
@@ -26,7 +27,7 @@ desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"
 desc_option_nghttp2="Enable shared nghttp2"
 desc_option_cares="Enable shared c-ares"
-build_options_default="libuv http_parser icu nghttp2 cares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
 
 replaces="iojs>=0"
 conflicts="nodejs nodejs-lts"
@@ -85,6 +86,10 @@ do_build() {
 	fi
 }
 
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
 do_install() {
 	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
 	rm $DESTDIR/usr/include/node/openssl -rf

From 13159005dbc6d93b1419d026599cae15750ce090 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 21 Mar 2021 14:32:09 +0100
Subject: [PATCH 230/305] xbps-src: respect $XBPS_CHECK_PKGS

---
 xbps-src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xbps-src b/xbps-src
index e2ecbf36e4f9..9d88873ab2c5 100755
--- a/xbps-src
+++ b/xbps-src
@@ -781,8 +781,8 @@ case "$XBPS_TARGET" in
         fi
         ;;
     fetch|extract|patch|configure|build|check|install|pkg)
-        if [ "$XBPS_TARGET" = "check" ]; then
-            export XBPS_CHECK_PKGS=1
+        if [ "$XBPS_TARGET" = "check" ] && [ -z "$XBPS_CHECK_PKGS" ]; then
+            export XBPS_CHECK_PKGS=full
         fi
         read_pkg
         if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then

From 39590709434154c4b65d88b7bf48fad8f4258865 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 22:14:43 +0100
Subject: [PATCH 231/305] removed_packages: add deepin*

---
 srcpkgs/removed-packages/template | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e114ab3bedee..9def53c8ece6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=37
+revision=38
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -33,6 +33,22 @@ replaces="
  ctpp2<=2.8.3_7
  ctpp2-devel<=2.8.3_7
  dht-node<=0.2.0_3
+ deepin-menu<=3.4.8_3
+ deepin-screenshot<=5.0.0_2
+ dtkwidget<=2.1.1_2
+ dtkwidget-devel<=2.1.1_2
+ dtkcore<=2.1.1_2
+ dtkcore-devel<=2.1.1_2
+ dtkwm<=2.0.12_1
+ dtkwm-devel<=2.0.12_1
+ deepin-calculator<=5.0.1_1
+ deepin-draw<=1.0.0_1
+ deepin-editor<=1.2.9.1_1
+ deepin-movie-reborn<=5.0.0_2
+ deepin-movie-reborn-devel<=5.0.0_2
+ deepin-turbo<=0.0.3_1
+ deepin-turbo-devel<=0.0.3_1
+ deepin-voice-recorder<=5.0.0_2
  djmount<=0.71_8
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2
@@ -56,6 +72,7 @@ replaces="
  goffice0.8<=0.8.17_6
  goproxy<=7.0_1
  go-gdm<=1.4_7
+ gsettings-qt<=0.1+17.10.20170824_3
  gst1-python<=1.18.3_1
  grv<=0.3.1_3
  gtkhtml<=4.10.0_1
@@ -234,6 +251,8 @@ replaces="
  qt-plugin-pgsql<=4.8.7_29
  qt-plugin-sqlite<=4.8.7_29
  qt-qmake<=4.8.7_29
+ qt5dxcb-plugin<=5.0.11_1
+ qt5integration<=5.0.0_7
  r2-bindings<=1.0.1_2
  reminiscence<=0.4.6_1
  rkt<=1.30.0_3

From c84228bbcb5371957deaa7025953bf2ba2d84576 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Mar 2021 12:50:35 -0700
Subject: [PATCH 232/305] wildmidi: update to 0.4.4

---
 srcpkgs/wildmidi/patches/fix-midi_file.patch | 17 -----------------
 srcpkgs/wildmidi/patches/save_midi.patch     | 13 +++++++++++++
 srcpkgs/wildmidi/template                    |  8 ++++----
 3 files changed, 17 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/wildmidi/patches/fix-midi_file.patch
 create mode 100644 srcpkgs/wildmidi/patches/save_midi.patch

diff --git a/srcpkgs/wildmidi/patches/fix-midi_file.patch b/srcpkgs/wildmidi/patches/fix-midi_file.patch
deleted file mode 100644
index 99c56fba6290..000000000000
--- a/srcpkgs/wildmidi/patches/fix-midi_file.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/wildmidi.c	2018-11-24 09:55:50.000000000 +0100
-+++ src/wildmidi.c	2020-01-23 17:07:12.497649804 +0100
-@@ -1978,12 +1978,8 @@
-                         if (!real_file) real_file = argv[optind];
-                         else real_file++;
- 
--                        strncpy(midi_file, real_file, strlen(real_file));
--                        midi_file[strlen(real_file)-4] = '.';
--                        midi_file[strlen(real_file)-3] = 'm';
--                        midi_file[strlen(real_file)-2] = 'i';
--                        midi_file[strlen(real_file)-1] = 'd';
--
-+                        snprintf(midi_file, sizeof(midi_file), "%.*s.mid",
-+                            (int)(strlen(real_file) - 4), real_file);
-                         printf("\rWriting %s: %u bytes.\r\n", midi_file, getmidisize);
-                         write_midi_output(getmidibuffer,getmidisize);
-                         free(getmidibuffer);
diff --git a/srcpkgs/wildmidi/patches/save_midi.patch b/srcpkgs/wildmidi/patches/save_midi.patch
new file mode 100644
index 000000000000..6f8cf832ad67
--- /dev/null
+++ b/srcpkgs/wildmidi/patches/save_midi.patch
@@ -0,0 +1,13 @@
+diff --git src/wildmidi.c src/wildmidi.c
+index a9ae0f1..fd9c5e7 100644
+--- src/wildmidi.c
++++ src/wildmidi.c
+@@ -1997,7 +1997,7 @@ int main(int argc, char **argv) {
+                         WildMidi_ClearError();
+                     } else {
+                         char *real_file = FIND_LAST_DIRSEP(argv[optind-1]);
+-                        if (!real_file) real_file = argv[optind];
++                        if (!real_file) real_file = argv[optind-1];
+                         else real_file++;
+                         mk_midifile_name(real_file);
+                         printf("\rWriting %s: %u bytes.\r\n", midi_file, getmidisize);
diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template
index e6772c66ca00..e7f6a9152235 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -1,7 +1,7 @@
 # Template file for 'wildmidi'
 pkgname=wildmidi
-version=0.4.3
-revision=6
+version=0.4.4
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
 configure_args="-DWANT_ALSA=1 -DWANT_OSS=1 -DWANT_OPENAL=1"
@@ -11,9 +11,9 @@ depends="libwildmidi"
 short_desc="Simple software midi player and core softsynth library"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later, LGPL-3.0-only"
-homepage="http://www.mindwerks.net/projects/wildmidi"
+homepage="https://www.mindwerks.net/projects/wildmidi"
 distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=498e5a96455bb4b91b37188ad6dcb070824e92c44f5ed452b90adbaec8eef3c5
+checksum=6f267c8d331e9859906837e2c197093fddec31829d2ebf7b958cf6b7ae935430
 
 post_install() {
 	vsconf ${FILESDIR}/wildmidi.cfg

From 176d69e3a64a47bb1420ac122dc7711b40cfde79 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 19 Mar 2021 19:28:43 +0100
Subject: [PATCH 233/305] empathy: Add patch for enchant2.

---
 .../{INSTALL.msg => files/README.voidlinux}   |  2 -
 srcpkgs/empathy/patches/enchant-2.patch       | 79 +++++++++++++++++++
 srcpkgs/empathy/template                      | 13 ++-
 3 files changed, 89 insertions(+), 5 deletions(-)
 rename srcpkgs/empathy/{INSTALL.msg => files/README.voidlinux} (76%)
 create mode 100644 srcpkgs/empathy/patches/enchant-2.patch

diff --git a/srcpkgs/empathy/INSTALL.msg b/srcpkgs/empathy/files/README.voidlinux
similarity index 76%
rename from srcpkgs/empathy/INSTALL.msg
rename to srcpkgs/empathy/files/README.voidlinux
index de8e50ea3da9..090705a4075f 100644
--- a/srcpkgs/empathy/INSTALL.msg
+++ b/srcpkgs/empathy/files/README.voidlinux
@@ -1,8 +1,6 @@
 Some optional packages must be installed for additional functionality:
 
-	- telepathy-butterfly for MSN support
 	- telepathy-gabble for XMPP/jabber support
 	- telepathy-haze for libpurple support
 	- telepathy-idle for IRC support
-	- telepathy-rakia for SIP support
 	- telepathy-salut for link-local XMPP support
diff --git a/srcpkgs/empathy/patches/enchant-2.patch b/srcpkgs/empathy/patches/enchant-2.patch
new file mode 100644
index 000000000000..c2b3a50c038f
--- /dev/null
+++ b/srcpkgs/empathy/patches/enchant-2.patch
@@ -0,0 +1,79 @@
+Source: https://gitlab.gnome.org/GNOME/empathy/-/merge_requests/3
+Upstream: no, because upstream is completely abandoned
+
+From f42c415154c797a1b3fbddde60ad8fedb2eda988 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon@bigon.be>
+Date: Tue, 7 Jan 2020 11:09:26 +0100
+Subject: [PATCH 1/2] libempathy-gtk: Stop using deprecated enchant function
+
+Replace enchant_dict_add_to_pwl() by enchant_dict_add() and bump minimal
+version accordingly
+---
+ configure.ac                   | 2 +-
+ libempathy-gtk/empathy-spell.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7aeb6b31c..4bf2d4d0c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0
+ GOA_REQUIRED=3.5.1
+ 
+ # Optional deps
+-ENCHANT_REQUIRED=1.2.0
++ENCHANT_REQUIRED=1.4.0
+ GEOCLUE_REQUIRED=2.1.0
+ GEOCODE_GLIB_REQUIRED=0.99.1
+ ISO_CODES_REQUIRED=0.35
+diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
+index 27f27f902..bb0159fd8 100644
+--- a/libempathy-gtk/empathy-spell.c
++++ b/libempathy-gtk/empathy-spell.c
+@@ -424,7 +424,7 @@ empathy_spell_add_to_dictionary (const gchar *code,
+ 	if (lang == NULL)
+ 		return;
+ 
+-	enchant_dict_add_to_pwl (lang->speller, word, strlen (word));
++	enchant_dict_add (lang->speller, word, strlen (word));
+ }
+ 
+ #else /* not HAVE_ENCHANT */
+-- 
+GitLab
+
+
+From 6c12a411274acf86e494b36704abb8e18b56642e Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon@bigon.be>
+Date: Tue, 7 Jan 2020 11:38:13 +0100
+Subject: [PATCH 2/2] configure.ac: Switch to enchant-2
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4bf2d4d0c..14f83c852 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0
+ GOA_REQUIRED=3.5.1
+ 
+ # Optional deps
+-ENCHANT_REQUIRED=1.4.0
++ENCHANT_REQUIRED=2.1.1
+ GEOCLUE_REQUIRED=2.1.0
+ GEOCODE_GLIB_REQUIRED=0.99.1
+ ISO_CODES_REQUIRED=0.35
+@@ -307,7 +307,7 @@ AC_ARG_ENABLE(spell,
+ if test "x$enable_spell" != "xno"; then
+    PKG_CHECK_MODULES(ENCHANT,
+    [
+-      enchant >= $ENCHANT_REQUIRED,
++      enchant-2 >= $ENCHANT_REQUIRED,
+       iso-codes >= $ISO_CODES_REQUIRED
+    ], have_enchant="yes", have_enchant="no")
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
index 4e01bad39a32..e039cdcf2176 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -1,21 +1,22 @@
 # Template file for 'empathy'
 pkgname=empathy
 version=3.12.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --enable-gst-1.0=yes --enable-gudev=yes --enable-spell=yes
  --disable-schemas-compile --disable-static --enable-goa=no
  --enable-ubuntu-online-accounts=no --enable-geocode=yes
  --enable-location=yes --enable-nautilus-sendto=no --enable-map=yes"
-hostmakedepends="pkg-config intltool itstool glib-devel libxslt geoclue2"
+hostmakedepends="pkg-config intltool itstool glib-devel libxslt geoclue2
+ autoconf automake libtool gettext-devel yelp-tools"
 makedepends="
  libcanberra-devel clutter-gst-devel clutter-gtk-devel
  telepathy-glib-devel telepathy-logger-devel libnotify-devel
  telepathy-farstream-devel telepathy-mission-control-devel
  evolution-data-server-devel geocode-glib-devel folks-devel
  webkit2gtk-devel libgudev-devel pulseaudio-devel cheese-devel
- enchant-devel NetworkManager-devel libchamplain-devel
+ enchant2-devel NetworkManager-devel libchamplain-devel
  gnutls-devel gsettings-desktop-schemas-devel geoclue2-devel iso-codes"
 depends="gsettings-desktop-schemas>=3.12 iso-codes"
 short_desc="GNOME instant messaging client using the Telepathy framework"
@@ -24,8 +25,14 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://live.gnome.org/Empathy"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3
+patch_args=-Np1
 disable_parallel_build=yes
 
 pre_configure() {
 	CFLAGS+=" -I$wrksrc/telepathy-account-widgets"
+	autoreconf -fi
+}
+
+post_install() {
+	vdoc $FILESDIR/README.voidlinux
 }

From b436f083f9254f33057fc044d37b0928ffdd2346 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 19 Mar 2021 20:00:53 +0100
Subject: [PATCH 234/305] empathy: disable checks

---
 srcpkgs/empathy/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
index e039cdcf2176..1c70413842b3 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -27,6 +27,8 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3
 patch_args=-Np1
 disable_parallel_build=yes
+# Disable checks, the only work with an irc server in place.
+make_check=no
 
 pre_configure() {
 	CFLAGS+=" -I$wrksrc/telepathy-account-widgets"

From 6cfe56f141809307f0a77a9357e612ad7c9486d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 22 Mar 2021 00:04:07 -0300
Subject: [PATCH 235/305] linux5.11: update to 5.11.8.

---
 srcpkgs/linux5.11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 0a8de535c05c..55570b2ed301 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.7
+version=5.11.8
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- cd7f9ec4ff4181422780a6c0206b8cea013d0d221e3c7d09de631108ce86b320"
+ dffcabb33733c58344243d722f77f0b38616796b7ecb287892ccb975c91de077"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From a45e0ca6311aa693abaa3fbe66910074787ed31e Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 16 Mar 2021 14:46:03 +0530
Subject: [PATCH 236/305] podman: Add fuse-overlayfs to depends

Closes: #29505 [via git-merge-pr]
---
 srcpkgs/podman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 470a811d86f6..1a186001f3db 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=3.0.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v2"
 go_package="${go_import_path}/cmd/podman"
@@ -9,7 +9,7 @@ go_build_tags="seccomp apparmor containers_image_ostree_stub
  btrfs_noversion exclude_graphdriver_btrfs"
 hostmakedepends="pkg-config go-md2man"
 makedepends="gpgme-devel libseccomp-devel device-mapper-devel"
-depends="runc conmon cni-plugins slirp4netns containers.image"
+depends="runc conmon cni-plugins slirp4netns containers.image fuse-overlayfs"
 short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"

From b9129f2bd6f6f949fad87e0846389492c0c89c67 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Wed, 17 Mar 2021 11:48:01 +0100
Subject: [PATCH 237/305] podman: enable btrfs storage driver

Adds INSTALL.msg that explains how to handle the new storage driver
options.

Closes: #29530
---
 srcpkgs/podman/INSTALL.msg | 21 +++++++++++++++++++++
 srcpkgs/podman/template    |  7 +++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/podman/INSTALL.msg

diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..6d69c9281eb5
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,21 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To keep the `vfs` driver, add this to `/etc/containers/storage.conf`
+or `~/.config/containers/storage.conf`:
+
+    [storage]
+    driver="vfs"
+
+Otherwise podman will display an error and refuse any further operation.
+
+Additionally the `btrfs` storage driver has been enabled. This driver is also
+available for rootless operation. Reset podman and add the following to your
+`storage.conf` to switch to this driver:
+
+    [storage]
+    driver="btrfs"
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 1a186001f3db..ce8b655a444d 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,14 +1,13 @@
 # Template file for 'podman'
 pkgname=podman
 version=3.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/podman/v2"
 go_package="${go_import_path}/cmd/podman"
-go_build_tags="seccomp apparmor containers_image_ostree_stub
- btrfs_noversion exclude_graphdriver_btrfs"
+go_build_tags="seccomp apparmor containers_image_ostree_stub"
 hostmakedepends="pkg-config go-md2man"
-makedepends="gpgme-devel libseccomp-devel device-mapper-devel"
+makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel"
 depends="runc conmon cni-plugins slirp4netns containers.image fuse-overlayfs"
 short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"

From 67b5205afdf4db5ac4aad521d09f31d808add5b3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 22 Mar 2021 12:13:46 +0100
Subject: [PATCH 238/305] sc-im: fix checksum

---
 srcpkgs/sc-im/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 1ef52b95e70a..f9bc91e23409 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause"
 homepage="https://github.com/andmarti1424/sc-im/"
 distfiles="https://github.com/andmarti1424/${pkgname}/archive/v${version}.tar.gz"
-checksum=ba65b3936a21ae65b19d99a4cfbb69bb57d8b00880f0781fb620e8857bc498db
+checksum=edc9b9d2dc5ac37c31a46462a1387605983149a1abba00d47ac22f2726ce6d27
 
 post_extract() {
 	vsed -i -e 's/lua51/lua5.1/g' \

From c4ecd507168c70692c5d750c2e680076b2930b63 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 22 Mar 2021 12:17:34 +0100
Subject: [PATCH 239/305] screen-message: update to 0.26.

---
 srcpkgs/screen-message/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/screen-message/template b/srcpkgs/screen-message/template
index 0f75dceed5e4..903d693fb86f 100644
--- a/srcpkgs/screen-message/template
+++ b/srcpkgs/screen-message/template
@@ -1,6 +1,6 @@
 # Template file for 'screen-message'
 pkgname=screen-message
-version=0.25
+version=0.26
 revision=1
 build_style=gnu-configure
 make_build_args='execgamesdir=$(prefix)/bin'
@@ -12,5 +12,5 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2"
 homepage="https://www.joachim-breitner.de/projects#screen-message"
 distfiles="https://www.joachim-breitner.de/archive/screen-message/screen-message-${version}.tar.gz"
-checksum=60291a493a6e30714c8704c614b37ef94621a917c3a9fa290800df82712989d3
+checksum=bc12a7b973844190c00a694d3fdc2327735b21d8b1231ec8ef66ba363ea98f37
 

From a22bc568997159a3fa6fef58d638d198108951de Mon Sep 17 00:00:00 2001
From: Dominik Schulz <mail@dschulz.eu>
Date: Sun, 21 Mar 2021 21:40:03 +0100
Subject: [PATCH 240/305] gopass: update to 1.12.4

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
---
 srcpkgs/gopass/template | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 2b3964146abc..887985426b3a 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,6 +1,6 @@
 # Template file for 'gopass'
 pkgname=gopass
-version=1.12.0
+version=1.12.4
 revision=1
 build_style=go
 build_helper=qemu
@@ -14,19 +14,13 @@ license="MIT"
 homepage="https://www.gopass.pw/"
 changelog="https://raw.githubusercontent.com/gopasspw/gopass/master/CHANGELOG.md"
 distfiles="https://github.com/gopasspw/gopass/archive/v${version}.tar.gz"
-checksum=73b7c5c8367e664d85871fba88f4fa806ef0fb75047c767a72b8516dea6f64b3
-
-post_build() {
-	gopass=$(find $GOPATH/bin -name gopass)
-	for shell in bash fish zsh; do
-		vtargetrun $gopass completion $shell > completion.$shell
-	done
-}
+checksum=1e3d7ad389a8462256ff7e439de1fbed8012c38ec33bded63b11af74f0525279
 
 post_install() {
 	vlicense LICENSE
+	vman gopass.1
 
 	for shell in bash fish zsh; do
-		vcompletion completion.$shell $shell
+		vcompletion $shell.completion $shell
 	done
 }

From 3be31a438a9d7bc47f12b6b209758b80248452c3 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 12:59:49 +0100
Subject: [PATCH 241/305] sudo: update to 1.9.6p1.

---
 srcpkgs/sudo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 1a088aaa0331..afeef528b027 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
 # Template file for 'sudo'
 pkgname=sudo
-version=1.9.5p2
-revision=2
+version=1.9.6p1
+revision=1
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
  --enable-shell-sets-home --enable-noargs-shell --without-sendmail
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://www.sudo.ws/"
 changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
 distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=539e2ef43c8a55026697fb0474ab6a925a11206b5aa58710cb42a0e1c81f0978
+checksum=a9e9cdc058fafeb9cd3ebfb864c81755e524d98aa022152763f25bce8ca3ca90
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 lib32disabled=yes
 

From 204e238d7b569ef0922521d66def29f6bf9532bc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 21 Mar 2021 21:36:01 +0200
Subject: [PATCH 242/305] eclipse: update to 4.19.

---
 srcpkgs/eclipse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 94952a88bae2..296ffefd4233 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.18
+version=4.19
 revision=1
 #code name of version
-_release=2020-12
+_release=2021-03
 archs="x86_64"
 wrksrc="eclipse"
 depends="openjdk11 gtk+3 webkit2gtk libXtst
@@ -19,7 +19,7 @@ _patch=R
 _edition=java
 _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
 distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=2193208753cae8505b4926386dc7bb71cb665929180bf8c1a63dda0251dbaaf1
+checksum=ecd00f7a669568827aca20581d5935c40c5bad621ff6baa42a9c46b5c7ea5dae
 python_version=2
 
 do_install() {

From 854cd12b8aacc829553c6c2d599fe40a1ed793f8 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sun, 21 Mar 2021 20:57:46 -0600
Subject: [PATCH 243/305] MultiMC: update to 0.6.12.

---
 srcpkgs/MultiMC/patches/be.patch | 37 --------------------------------
 srcpkgs/MultiMC/template         |  6 +++---
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/patches/be.patch

diff --git a/srcpkgs/MultiMC/patches/be.patch b/srcpkgs/MultiMC/patches/be.patch
deleted file mode 100644
index 6f81b8790437..000000000000
--- a/srcpkgs/MultiMC/patches/be.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fixes build on big endian.
-
---- libraries/classparser/src/javaendian.h
-+++ libraries/classparser/src/javaendian.h
-@@ -11,32 +11,26 @@ inline uint64_t bigswap(uint64_t x)
- {
-     return x;
- }
--;
- inline uint32_t bigswap(uint32_t x)
- {
-     return x;
- }
--;
- inline uint16_t bigswap(uint16_t x)
- {
-     return x;
- }
--;
- inline int64_t bigswap(int64_t x)
- {
-     return x;
- }
--;
- inline int32_t bigswap(int32_t x)
- {
-     return x;
- }
--;
- inline int16_t bigswap(int16_t x)
- {
-     return x;
- }
--;
- #else
- inline uint64_t bigswap(uint64_t x)
- {
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 2ec51601f47c..162472b00022 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,6 +1,6 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
-version=0.6.11
+version=0.6.12
 revision=1
 wrksrc="${pkgname}5-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
@@ -12,13 +12,13 @@ hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar"
 makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
 depends="virtual?java-environment"
 short_desc="Instanced Minecraft client"
-maintainer="Spencer H <spencernh77@gmail.com>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="Apache-2.0"
 homepage="http://multimc.org"
 distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz
  https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
  https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="7cad736f1fe3f2887aeaa7a7f3927930e16ed815c98e4cf3a7378a99c426a775
+checksum="c251744b77d93db4ead56940b7b81d30dc5390fb86a1676d3f0364cc4e570185
  36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
  ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
 skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"

From 19525f810f3e80145cbf76f2845df6c2a731245a Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 22 Mar 2021 17:57:39 +1100
Subject: [PATCH 244/305] checkbashisms: update to 2.21.1.

---
 srcpkgs/checkbashisms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template
index 3a51d474caa0..9aa2b0dc0e2b 100644
--- a/srcpkgs/checkbashisms/template
+++ b/srcpkgs/checkbashisms/template
@@ -1,6 +1,6 @@
 # Template file for 'checkbashisms'
 pkgname=checkbashisms
-version=2.20.4
+version=2.21.1
 revision=2
 wrksrc="devscripts-${version}"
 depends="perl"
@@ -10,7 +10,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/devscripts"
 distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz"
-checksum=f94fe99c1e70443d9e2dcd58c1e530c182840a8b890c5f9a4f0d4af3bf521b9c
+checksum=d596c8894ac5777f2e3152f2ed86b22cb9b946b99ca2fb00fbe2536fc3db4c52
 
 pre_install() {
 	vsed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl

From 465689fff43034d4632f750582c10e92eb8b1fa8 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 22 Mar 2021 09:30:00 +0100
Subject: [PATCH 245/305] slack-desktop: update to 4.14.0

---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 92efdaf151c1..794c7470bdb9 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.13.0
+version=4.14.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b8a63e1a91e4320b7e46aed692a5579fe2334b0f6963f9dceedccd05a7f51bc3
+checksum=cfa500b6c5109724d5fc123477d5e4c9740e332a56397a1413462da9358ac977
 restricted=yes
 repository="nonfree"
 nopie=yes

From abf2b726594d96dceb076a5d3430b7b5331257ac Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Mar 2021 14:28:49 +0100
Subject: [PATCH 246/305] bcc: update to 0.19.0.

---
 srcpkgs/bcc/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index a0ead1ec73e4..13df47857f5c 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,6 +1,6 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.18.0
+version=0.19.0
 revision=1
 wrksrc="bcc"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
 distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=d05f2da69545bbb727b929e581c12f6c47729316211899d3734e08f7cff2215b
+checksum=4c41fc1a6a7ef2084b43c52c1b2e6104230ba9f31e02958416bf131d848e74e4
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -22,6 +22,7 @@ fi
 
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
+	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
 }
 bcc-tools_package() {
 	short_desc+=" - tools"

From 27ab8d37a2ed3c55a16c55c73932506a99d80f00 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Mar 2021 15:09:01 +0100
Subject: [PATCH 247/305] gucci: update to 1.3.0.

---
 srcpkgs/gucci/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index fd3f94cdf7e7..489af4487ada 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=50d9d513fff97128bbd92685af5b244cbc1453e79010fb2b1aea51c84d478855
+checksum=c54c8e7c5273dcd959d11b42820e35acf8150f4ed40c56281c70c5fea16f0753
 
 post_install() {
 	vlicense LICENSE

From c0e1e5459e540de27eda77e54696642484c45aa3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Mar 2021 15:11:49 +0100
Subject: [PATCH 248/305] kubefwd: update to 1.18.1.

---
 srcpkgs/kubefwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index da5cc8f8a700..68881162412f 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,6 +1,6 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/txn2/kubefwd"
 distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
-checksum=797068193a9e3edfecc8586290d9fb957239063c79cf2ec8495f3e1ccb31186e
+checksum=ff4c0da2a63ddc13ab33138b12cbcca6570aafd590773a3abb28106efbec0205
 
 post_install() {
 	vlicense NOTICE

From 9dc314d5a6e25a857bc6a455aa511dfdc7566a5a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Mar 2021 15:11:53 +0100
Subject: [PATCH 249/305] miller: update to 5.10.1.

---
 srcpkgs/miller/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index 1ce42d4e162c..918f35499fbf 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,6 +1,6 @@
 # Template file for 'miller'
 pkgname=miller
-version=5.10.0
+version=5.10.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="asciidoc automake flex libtool"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="http://johnkerl.org/miller/"
 changelog="https://github.com/johnkerl/miller/releases"
 distfiles="https://github.com/johnkerl/${pkgname}/archive/v${version}.tar.gz"
-checksum=913abe277726bd7fa928fd5db530b0cd61dba74cc454e5d2ddb7c4934979efb6
+checksum=dd9129b0dbeae4a1dde8b1f095dec1226468da8d29dd58d1913b2137180cbb95
 
 pre_configure() {
 	# Disable debugging and profiling versions, broken on musl.

From 2bdf0966f9ad0ae8961d95c58c4eb64f3a4cc6b6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Mar 2021 15:12:59 +0100
Subject: [PATCH 250/305] python3-pyinfra: update to 1.3.9.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index edb1120fdd31..bcf20c665678 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.3.7
+version=1.3.9
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=5ea2765026fd33275262aa6b96cec11391f4fa1d5d47359d9837694220c970a8
+checksum=55c5ee9e39e76a36760ee2a210c259c57579a80715a79ea1778f491102f3737b
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 10ef6415b188684abeb1a489f822810a85879f6f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Mar 2021 15:14:41 +0100
Subject: [PATCH 251/305] xchm: update to 1.32.

---
 srcpkgs/xchm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xchm/template b/srcpkgs/xchm/template
index 2dc2f1bd9fb1..48659ed4f886 100644
--- a/srcpkgs/xchm/template
+++ b/srcpkgs/xchm/template
@@ -1,6 +1,6 @@
 # Template file for 'xchm'
 pkgname=xchm
-version=1.31
+version=1.32
 revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/rzvncj/xCHM"
 distfiles="https://github.com/rzvncj/xCHM/releases/download/${version}/xchm-${version}.tar.gz"
-checksum=0e1f6bbcb88e8e8fd200b5531e3486ecc04a614c4234356c397cf188b55f862b
+checksum=b225adf2da99ab26b039d675c446018bb33815f47aae898cf0bc18cb4ef5222c
 
 pre_configure() {
 	autoreconf -fi

From d68632a492156b4ec204d8cef43cbefe98647464 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Mar 2021 15:14:54 +0100
Subject: [PATCH 252/305] netpbm: update to 10.93.02.

---
 srcpkgs/netpbm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 83460a517728..c20e2e9a8d1e 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -3,8 +3,8 @@ pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
 version=10.93.02
 revision=1
-_githash=b722c09c991306f5ce77a310195e9b1262547ef1
-_githash_guide=c3ea5d343ccdc2945b6ee3bc157af66f89433fd9
+_githash=a7fca291a0c78333da13e855bdb73aa819ba8649
+_githash_guide=db21e5ffa2830350c67547e3007c891ed75d9dac
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="a2f6613baabd8c7d8c421d5ef95984fbd62bcc10c42f60ac48ec347f83fcbeb4
- 73e83e94b4089d11d2b349b66b6edae801ff24f6a8b9d2f8ea3beb7a9cdceddf"
+checksum="789514f480f6b487eb9274b9f1fe94d950ba48755792b42c85e41aa4bb1ef572
+ 01210c2019b9131bcbbe0cec8759423b7b7018e6c8acba7b48cca3356758c96f"
 
 post_extract() {
 	cd $build_wrksrc

From 9b69013809ee079f42ebd4af0ab346c06ff38779 Mon Sep 17 00:00:00 2001
From: Duje Mihanovic <mihaduje@pm.me>
Date: Sun, 21 Mar 2021 11:15:26 +0100
Subject: [PATCH 253/305] arduino-cli: update to 0.17.0.

---
 srcpkgs/arduino-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8eb251b2744..fc74084b6c3e 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
-version=0.13.0
+version=0.17.0
 revision=1
 build_helper=qemu
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/arduino/arduino-cli"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=08c7e45128a58b7292154669e9418213e3568628a0638a603e8117a07f6747b1
+checksum=f54225edb7417be80d686ee7eb4eb281124ddccc13a34d761f12e790f265df9d
 
 case "$XBPS_TARGET_MACHINE" in
 	# the downloaded toolchains use glibc, this allows them to work on musl

From 475aaf7106a30ade93a6281486370ba1b852edca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 22 Mar 2021 19:11:18 +0100
Subject: [PATCH 254/305] ardour: fix update check

---
 srcpkgs/ardour/update | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ardour/update b/srcpkgs/ardour/update
index 8f3a884c89a5..02dff8a9f226 100644
--- a/srcpkgs/ardour/update
+++ b/srcpkgs/ardour/update
@@ -1,2 +1 @@
-site=https://github.com/Ardour/ardour/tags
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+site=https://community.ardour.org/src/

From 5a332b821029fce74bd1a25c5caa519e796bbcd1 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 22 Mar 2021 16:46:53 +0100
Subject: [PATCH 255/305] miniflux: update to 2.0.29.

---
 srcpkgs/miniflux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 79f2ee9aa52f..b6c677a2aa70 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.28
+version=2.0.29
 revision=1
 wrksrc="v2-${version}"
 build_style=go
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog"
 distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=717647e06c067dbe62c1c2798b9f63855dfcf838eae1d345bb85f5d1124c13dc
+checksum=dcce29b07738cd2ffe1da3cf1401d8c49ead421a81e2b2239323f3423c867200
 system_accounts="_miniflux"
 
 post_install() {

From 6f19ed59436338e8aafe805f68c66d586157ca41 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 22 Mar 2021 11:33:33 +0200
Subject: [PATCH 256/305] 66-tools: update to 0.0.7.2.

---
 srcpkgs/66-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
index 4aa2674cca2f..876ef69fdfa6 100644
--- a/srcpkgs/66-tools/template
+++ b/srcpkgs/66-tools/template
@@ -1,6 +1,6 @@
 # Template file for '66-tools'
 pkgname=66-tools
-version=0.0.7.1
+version=0.0.7.2
 revision=1
 wrksrc=${pkgname}-v${version}
 build_style=configure
@@ -16,7 +16,7 @@ license="ISC"
 homepage="http://web.obarun.org/software/index.html"
 changelog="https://framagit.org/Obarun/66-tools/-/raw/master/NEWS.md"
 distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz"
-checksum=370fda8d10254bfece86cbeabf7b4d48d8b47e91bd57fe5bae12e18b5a032547
+checksum=2732c67211d0ea1f0bda5ae55dc3be41f07a7e75d6006867cc5b8c87d1c29984
 
 post_install() {
 	vlicense LICENSE

From 869a76901eaed2307da6fddc5e73c51e3e1d96b5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 22 Mar 2021 20:55:05 +0100
Subject: [PATCH 257/305] nodejs-lts-10: fix build on ppc64

---
 srcpkgs/nodejs-lts-10/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 41a13c12d95a..3944d359c673 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -65,10 +65,6 @@ do_configure() {
 		esac
 		_args+=" --without-snapshot"
 	fi
-	# their pregenerated asm is for ELFv1...
-	case "$XBPS_TARGET_MACHINE" in
-		ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
-	esac
 	./configure --prefix=/usr --shared-zlib \
 		$(vopt_if icu --with-intl=system-icu) \
 		$(vopt_if http_parser --shared-http-parser) \

From b7f9c3fa5f3fbd379f85d66d600e5266545241d6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 22 Mar 2021 20:54:46 +0100
Subject: [PATCH 258/305] nodejs-lts: fix build on ppc64

---
 srcpkgs/nodejs-lts/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 7eca82bcacea..f9326d337555 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -64,10 +64,6 @@ do_configure() {
 		esac
 		_args+=" --cross-compiling"
 	fi
-	# their pregenerated asm is for ELFv1...
-	case "$XBPS_TARGET_MACHINE" in
-		ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
-	esac
 	./configure --prefix=/usr --shared-zlib \
 		$(vopt_if icu --with-intl=system-icu) \
 		$(vopt_if http_parser --shared-http-parser) \

From 81567505425744af7d66783092c3528860fc7348 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 22 Mar 2021 20:54:30 +0100
Subject: [PATCH 259/305] nodejs: fix build on ppc64

---
 srcpkgs/nodejs/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 27eb39e7b4fe..450b59bbc7d0 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -75,10 +75,6 @@ do_configure() {
 		# to execute it within the build system fails
 		_args+=" --cross-compiling"
 	fi
-	# their pregenerated asm is for ELFv1...
-	case "$XBPS_TARGET_MACHINE" in
-		ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
-	esac
 	./configure --prefix=/usr --shared-zlib \
 		$(vopt_if icu --with-intl=system-icu) \
 		$(vopt_if http_parser --shared-http-parser) \

From 8fae4785eaaa8bb28a08de4c63315021580602b6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 22 Mar 2021 21:53:30 +0200
Subject: [PATCH 260/305] doctest: update to 2.4.6.

---
 srcpkgs/doctest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctest/template b/srcpkgs/doctest/template
index cd1e36e79128..394697cfb41e 100644
--- a/srcpkgs/doctest/template
+++ b/srcpkgs/doctest/template
@@ -1,6 +1,6 @@
 # Template file for 'doctest'
 pkgname=doctest
-version=2.4.5
+version=2.4.6
 revision=1
 build_style=cmake
 short_desc="Doctest C++ testing framework"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/onqtam/doctest"
 changelog="https://raw.githubusercontent.com/onqtam/doctest/master/CHANGELOG.md"
 distfiles="https://github.com/onqtam/doctest/archive/${version}.tar.gz"
-checksum=b76ece19f0e473e3afa5c545dbdce2dd70bfef98ed0f383443b2f9fd9f86d5b4
+checksum=39110778e6baf373ef04342d7cb3fe35da104cb40769103e8a2f0035f5a5f1cb
 
 post_install() {
 	vlicense LICENSE.txt

From 8cf67e369560428c7c6b8b515c1a6f99b0ad469f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 21 Mar 2021 14:07:34 +0100
Subject: [PATCH 261/305] pmbootstrap: update to 1.29.2.

---
 srcpkgs/pmbootstrap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index d1660a8a59dc..d07b5b44f291 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
-version=1.29.1
-revision=2
+version=1.29.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools coreutils procps-ng openssl git"
@@ -10,7 +10,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://postmarketos.org"
 distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz"
-checksum=d3608be5db1dedfa150c90248aadbc72211274802cfe2c0b87427b8cf91a73b4
+checksum=7288217212dbb89d6623718561440c3593a99c298db631912ea4a192ca397fb2
 
 do_check() {
 	# tests require chroot

From df7c58e0d230adb15f9ffad0ce252d10aef1f540 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 21 Mar 2021 11:45:41 +0100
Subject: [PATCH 262/305] gitui: update to 0.13.0

---
 srcpkgs/gitui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 086784669a6d..69ea33936ab0 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,6 +1,6 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.12.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=061536ecd2c9f9f52d4aecaece86e1e3c6fd1b88f25ce11483a783b800b9ec9e
+checksum=ebf3ba559d05205e629805f60441411a0609e2a84444753cfd3a4a3ff1b98009
 
 post_install() {
 	vlicense LICENSE.md

From 90d0add71f8170a4c7472fbeeb0fd22c25c88d08 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sun, 21 Mar 2021 11:48:15 +0100
Subject: [PATCH 263/305] python3-pikepdf: update to 2.9.1.

---
 srcpkgs/python3-pikepdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index fd1e435f7088..8f8270f51a88 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.9.0
+version=2.9.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a9dbd2bb52fcdecb066c99cacf96f0ebb40edee50d8885502a5a22d7f723a8b7
+checksum=99c19cf0dd0fc89fc9e6a0de61e974e34d4111dd69802aeaee3e61fb1a74a3d8
 
 pre_build() {
 	vsed -i "s/__version__.*/__version__ = '${version}'/g" setup.py

From 1f50a8d58b6f0f5aa4b5bc3351ceb3787d582b09 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 21 Mar 2021 11:57:16 +0100
Subject: [PATCH 264/305] sidplayfp: update to 2.1.1.

---
 srcpkgs/sidplayfp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sidplayfp/template b/srcpkgs/sidplayfp/template
index e2544b8022c7..d5d46726ca9c 100644
--- a/srcpkgs/sidplayfp/template
+++ b/srcpkgs/sidplayfp/template
@@ -1,6 +1,6 @@
 # Template file for 'sidplayfp'
 pkgname=sidplayfp
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Zeinok <zeinok@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/sidplay-residfp/"
 distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=a8f99bd915e54988fc983372bdbef4094a09cfea6c73b75d2c6d33921f26ab69
+checksum=98f9d1d2701321c1cf4a7aa16ff90a2e0579013afa8087f1d550c7d43a355807

From 154faa0090c9d5b77a565d49798c598e203e533c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 21 Mar 2021 13:40:59 +0100
Subject: [PATCH 265/305] pithos: update to 1.5.1.

---
 srcpkgs/pithos/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pithos/template b/srcpkgs/pithos/template
index a8e8cfca2141..3b44af9b8bd9 100644
--- a/srcpkgs/pithos/template
+++ b/srcpkgs/pithos/template
@@ -1,9 +1,8 @@
 # Template file for 'pithos'
 pkgname=pithos
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=meson
-pycompile_module="pithos"
 hostmakedepends="pkg-config intltool python3 glib-devel"
 depends="gtk+3 python3-gobject libsecret gst-plugins-good1 gst-libav gnome-keyring"
 short_desc="Native Pandora Radio client"
@@ -11,5 +10,5 @@ maintainer="osn64 <dave@techthrones.com>"
 license="GPL-3.0-or-later"
 homepage="https://pithos.github.io/"
 distfiles="https://github.com/pithos/pithos/releases/download/${version}/pithos-${version}.tar.xz"
-checksum=61e2a778252358519979ea53ab9fb9dd10a9554d24f3e249560bc4971f386133
+checksum=6850234fb7cf5a66f72219ef571b8f61b2506d314320274a236e514fd6fe90cd
 python_version=3

From c905a9e6d66b26415cc949aafe0c571b3138c219 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 21 Mar 2021 13:44:57 +0100
Subject: [PATCH 266/305] pkgtop: update to 2.4.

---
 srcpkgs/pkgtop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index fa85a7e82976..fcba6967e66d 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,6 +1,6 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
-version=2.2
+version=2.4
 revision=1
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/orhun/pkgtop"
 distfiles="https://github.com/orhun/pkgtop/archive/${version}.tar.gz"
-checksum=bbc43c463fcc0251159ff9570f38fa33c8ce7ff6357ad703c3a88e51df5bb33a
+checksum=8730516d14524e696f11b56ae3158f9a1853d620b27c5f960b9b6a4f6aedb2df
 
 post_install() {
 	mv ${DESTDIR}/usr/bin/{src,pkgtop}

From d584b590cb3af7e829577e492033abceba852dd6 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 22 Mar 2021 20:10:17 +0100
Subject: [PATCH 267/305] chatty: update to 0.14.

---
 srcpkgs/chatty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index e74cd5eb51fb..a13ad9765b5a 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,6 +1,6 @@
 # Template file for 'chatty'
 pkgname=chatty
-version=0.13.1
+version=0.14
 revision=1
 hostmakedepends="gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-only"
 homepage="http://chatty.github.io/"
 distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz"
-checksum=72c82832893b96cb744905fd4a9c7015a8cf3670c53f4e42a9256908caf90c05
+checksum=2eed3a4ed4f1ea58d89e535182bd32771522e4bccb5aa3bf4329aec9d7ab554c
 
 do_build() {
 	gradle shadowJar

From f6ee26037ab051876d2b0b704600f49932cbad3d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 21 Mar 2021 14:17:21 +0100
Subject: [PATCH 268/305] pockyt: update to 1.4.3.

---
 srcpkgs/pockyt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pockyt/template b/srcpkgs/pockyt/template
index 2b48919d79c8..7fa36435c4ef 100644
--- a/srcpkgs/pockyt/template
+++ b/srcpkgs/pockyt/template
@@ -1,14 +1,14 @@
 # Template file for 'pockyt'
 pkgname=pockyt
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-parse"
-pycompile_module="$pkgname"
 short_desc="Automate and manage your pocket collection"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/arvindch/pockyt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=26d16ad6f2dad7db8726f538a9b49ac268731ea3b323c6d48d56873527c35e0b
+checksum=24ef22d63f798a0134d6ccfffdcc0278165b0d683115cf2376e6443e9a765a85
+make_check=no # no tests available

From fe899cd0237ea79202054ea022b11aa336b92449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 22 Mar 2021 22:53:51 +0100
Subject: [PATCH 269/305] font-ionicons-ttf: update to 5.5.1, orphan.

---
 srcpkgs/font-ionicons-ttf/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/font-ionicons-ttf/template b/srcpkgs/font-ionicons-ttf/template
index ec8eb47dce10..e7f44b60c605 100644
--- a/srcpkgs/font-ionicons-ttf/template
+++ b/srcpkgs/font-ionicons-ttf/template
@@ -1,15 +1,15 @@
 # Template file for 'font-ionicons-ttf'
 pkgname=font-ionicons-ttf
-version=5.2.3
+version=5.5.1
 revision=1
-wrksrc="ionicons-$version"
+wrksrc="ionicons-${version}"
 depends="font-util"
 short_desc="Icon font from the Ionic Framework"
-maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://ionicons.com/"
 distfiles="https://github.com/ionic-team/ionicons/archive/v${version}.tar.gz"
-checksum=432a06fe7f79f165fea84bd069a1572f2c7ce66e255bd7494130ace7e202cb3c
+checksum=102dbdd723ede2d3e7dc5bc51d3d71cf9008d0c84f7a61808a54fbe1323c9d0b
 
 font_dirs="/usr/share/fonts/TTF"
 

From 2567d33bd6b35e10254375bb3ce02b139b8a3b3e Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Mon, 22 Mar 2021 22:28:13 +0000
Subject: [PATCH 270/305] kibi: update to 0.2.2

---
 srcpkgs/kibi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kibi/template b/srcpkgs/kibi/template
index 03a41d180ffe..ac746edf7826 100644
--- a/srcpkgs/kibi/template
+++ b/srcpkgs/kibi/template
@@ -1,6 +1,6 @@
 # Template file for 'kibi'
 pkgname=kibi
-version=0.2.1
+version=0.2.2
 revision=1
 build_style=cargo
 short_desc="Lightweight, configurable text editor"
@@ -8,7 +8,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/ilai-deutel/kibi"
 distfiles="https://github.com/ilai-deutel/kibi/archive/v${version}.tar.gz"
-checksum=f6171a2c1be66aa52814b736d6c06ad9ad50b71869e4447196e16ecf951eb494
+checksum=df0e2945d9d08fed3a0adbe73c73405641615eb55835675e06e91411fd541e91
 
 post_install() {
 	vdoc README.md

From d74a1ceb1dd87a53ed349745becc56429137e8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 22 Mar 2021 22:56:30 +0100
Subject: [PATCH 271/305] i3status-rust: update to 0.14.7.

---
 srcpkgs/i3status-rust/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 2f89e13162ca..55714115f980 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,17 +1,18 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.14.2
+version=0.14.7
 revision=1
 build_style=cargo
+make_check_args="--bins"
 hostmakedepends="pkg-config"
-makedepends="dbus-devel pulseaudio-devel"
+makedepends="dbus-devel pulseaudio-devel openssl-devel"
 short_desc="Replacement for i3status, written in Rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=66a11cbcfa515c761701788edd573d408391c024086219d8b6641333129a6f87
+checksum=4169f003d5d21cb010be4edbdbb5bc09ed4823240d0a5ea8efe23c28f2413bbd
 
 post_install() {
 	vman man/i3status-rs.1

From e7449fb5803ce13f335416c3c5e0a824a1a6c393 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 22 Mar 2021 17:47:42 -0600
Subject: [PATCH 272/305] Amass: update to 3.11.10.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index bef388023d2e..ebeafa84e45c 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.11.9
+version=3.11.10
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=82e69f400ed16210c9aaa49351b6f44ae986caf0d1c1080d532a1dd170c018ed
+checksum=4e2b898c12e733922738c56305fffb509ccacd2dd74a91dc2fd39fcc1564080f

From 8b6b0cd52b48d66450f1c45a9d7cfeb79466ceff Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Mar 2021 02:03:24 +0100
Subject: [PATCH 273/305] webkit2gtk: update to 2.30.6

---
 srcpkgs/webkit2gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 904ecd1b69b8..60ab9db8861f 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.30.5
+version=2.30.6
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -42,7 +42,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f
+checksum=50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
 build_options_default="gir wayland x11 bubblewrap minibrowser"

From a626df06e1bbaf770381cbe5b3222d06392eac75 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 8 Mar 2021 09:49:28 +0100
Subject: [PATCH 274/305] minikube: update to 1.18.1.

---
 srcpkgs/minikube/template | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index a091708aa979..7b35584e34a1 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,9 +1,10 @@
 # Template file for 'minikube'
 pkgname=minikube
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 build_helper=qemu
+go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
 go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
 hostmakedepends="go-bindata python pkg-config git"
 makedepends="libvirt-devel"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://github.com/kubernetes/minikube"
 changelog="https://raw.githubusercontent.com/kubernetes/minikube/master/CHANGELOG.md"
 distfiles="https://github.com/kubernetes/minikube/archive/v$version.tar.gz"
-checksum="c3f0f60607bca0c2f1a118d6d5ce313ac0c6e56b5f9621cb00ca17271aceaff6"
+checksum=4ade34adf8d33ddd141d436b33cb66d4183e059f8a112ea1aeb1edeae9302594
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
@@ -23,7 +24,16 @@ pre_configure() {
 }
 
 pre_build() {
+	local storage_provisioner_tag= iso_version=
+
 	make pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
+	storage_provisioner_tag=$(sed -n '/^STORAGE_PROVISIONER_TAG/s/.*=\W*//p' Makefile)
+	iso_version=$(sed -n '/^ISO_VERSION/s/.*=\W*//p' Makefile)
+
+	go_ldflags+="
+		-X k8s.io/minikube/pkg/version.isoVersion=$iso_version
+		-X k8s.io/minikube/pkg/version.storageProvisionerVersion=$storage_provisioner_tag
+	"
 }
 
 do_install() {

From ff761429c6c7ab32ebf99a41bfb0660b6a6226c0 Mon Sep 17 00:00:00 2001
From: noarchwastaken <noarch@n0ar.ch>
Date: Mon, 22 Mar 2021 17:59:40 -0400
Subject: [PATCH 275/305] linux-firmware: update to 20210315.

---
 srcpkgs/linux-firmware/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index eaec08986e3f..6d4a5ffbb45c 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,14 +1,14 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20210208
-revision=2
+version=20210315
+revision=1
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=c5d0448326b5fba5bc97ab448d641d8e093e365fc496e5ea3da6bfd31fa94770
+checksum=0b90f7090cf15bbc1002a6dbb03487511e8687b072d364250de8c7429dd82fdd
 python_version=3
 nostrip=yes
 

From accc3f1c2b20da6b642fe43d13373f6c809b1a38 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 22 Mar 2021 17:05:06 +0100
Subject: [PATCH 276/305] yq-go: update to 4.6.2.

---
 srcpkgs/yq-go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 55601f5ae852..fa5fb53ec35e 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.6.1
+version=4.6.2
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=a843b90e4e86efa310284823ab6f1249e4ae3c6aa5df4d61c10b0fdc543b267d
+checksum=3edee5bae40afdf8869803c6f81eb15adbaaf373ba27e4907d6dd5dceebaf65c
 
 do_check() {
 	go test -v

From fde73f75d61d6f1d902b6ca65043d7a5aa2c0980 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 23 Mar 2021 09:54:51 -0400
Subject: [PATCH 277/305] python3-prompt_toolkit: update to 3.0.18.

---
 srcpkgs/python3-prompt_toolkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 85cf23c3f708..3445eedf66a2 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.17
+version=3.0.18
 revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=9397a7162cf45449147ad6042fa37983a081b8a73363a5253dd4072666333137
+checksum=e1b4f11b9336a28fa11810bc623c357420f69dfdb6d2dac41ca2c21a55c033bc
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From 78d3fac78bc33d1dbf673ce9c392aa8d30d2bee3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 23 Mar 2021 09:55:23 -0400
Subject: [PATCH 278/305] python3-flit_core: update to 3.2.0.

---
 srcpkgs/python3-flit_core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index b8dffd13ec40..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.1.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=c45104d677572958cbe63ae99011bed16b6e1cf5d6620bc6a8c6f1cfcd7aa40b
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE

From 972e66e51178fe4d5fb55bbc86d3c8bafcac5ca4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 23 Mar 2021 09:58:09 -0400
Subject: [PATCH 279/305] goimapnotify: update to 2.1.1.

---
 srcpkgs/goimapnotify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 4b4f63af9b9b..87df1411bfcb 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,6 +1,6 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
-version=2.1
+version=2.1.1
 revision=1
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
@@ -11,4 +11,4 @@ license="GPL-3.0-only"
 homepage="https://gitlab.com/shackra/goimapnotify"
 changelog="https://gitlab.com/shackra/goimapnotify/blob/master/CHANGELOG.rst"
 distfiles="https://${go_import_path}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=61de26813671abcea5026cafd8d2acd12ee6913c661adcdf685f61d7cc6ded82
+checksum=bd791dc6561e2e1f6221ab576dfaa987c8b12beae343b004814ece6a7e4ca4c9

From 5aa6dd744cdc82c1edc08965b7dfc6339fe49513 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 15 Mar 2021 01:55:20 +1100
Subject: [PATCH 280/305] New package: wally-cli-2.0.0

Closes: #28000 [via git-merge-pr]
---
 srcpkgs/wally-cli/INSTALL.msg          |  3 +++
 srcpkgs/wally-cli/files/50-wally.rules | 11 +++++++++++
 srcpkgs/wally-cli/files/LICENSE        |  9 +++++++++
 srcpkgs/wally-cli/template             | 23 +++++++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 srcpkgs/wally-cli/INSTALL.msg
 create mode 100644 srcpkgs/wally-cli/files/50-wally.rules
 create mode 100644 srcpkgs/wally-cli/files/LICENSE
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/INSTALL.msg b/srcpkgs/wally-cli/INSTALL.msg
new file mode 100644
index 000000000000..6313b5615bad
--- /dev/null
+++ b/srcpkgs/wally-cli/INSTALL.msg
@@ -0,0 +1,3 @@
+Please add your user to the group 'plugdev' by executing the following:
+
+usermod -aG plugdev "$USER"
diff --git a/srcpkgs/wally-cli/files/50-wally.rules b/srcpkgs/wally-cli/files/50-wally.rules
new file mode 100644
index 000000000000..742cde5c1f91
--- /dev/null
+++ b/srcpkgs/wally-cli/files/50-wally.rules
@@ -0,0 +1,11 @@
+# These rules are derived from the instructions at
+# https://github.com/zsa/wally/wiki/Linux-install#2-create-a-udev-rule-file
+
+# Teensy rules for the Ergodox EZ
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+
+# STM32 rules for the Moonlander and Planck EZ
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
\ No newline at end of file
diff --git a/srcpkgs/wally-cli/files/LICENSE b/srcpkgs/wally-cli/files/LICENSE
new file mode 100644
index 000000000000..45bbd402c83a
--- /dev/null
+++ b/srcpkgs/wally-cli/files/LICENSE
@@ -0,0 +1,9 @@
+## License (MIT)
+
+Copyright 2019-2020, ZSA Technology Labs Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 000000000000..3c70966e7b68
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,23 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+go_import_path="github.com/zsa/wally-cli"
+hostmakedepends="pkg-config"
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+conf_files="/usr/lib/udev/rules.d/50-wally.rules"
+system_groups="plugdev"
+
+post_install() {
+	# vendoring license is obsolete in the next release
+	vlicense "$FILESDIR/LICENSE"
+	vinstall "$FILESDIR/50-wally.rules" 0644 /usr/lib/udev/rules.d
+}

From c8a30aa3b3a4468156ab348e5c58911243cfab57 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 23 Mar 2021 17:36:40 +0100
Subject: [PATCH 281/305] mpg123: update to 1.26.5.

---
 srcpkgs/mpg123/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index e10cab8a3eba..e62f0bbd4be0 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,6 +1,6 @@
 # Template file for 'mpg123'
 pkgname=mpg123
-version=1.26.4
+version=1.26.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-optimization=0 --with-default-audio=alsa
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.mpg123.org/"
 distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
-checksum=081991540df7a666b29049ad870f293cfa28863b36488ab4d58ceaa7b5846454
+checksum=502a97e0d935be7e37d987338021d8f301bae35c2884f2a83d59c4b52466ef06
 
 case "$XBPS_TARGET_MACHINE" in
 	# No LFS required with musl

From 0980f1ca52fd3cb8c9d5e2f428c40fde20d8f08d Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Mon, 22 Mar 2021 01:02:26 +0600
Subject: [PATCH 282/305] textadept: update to 11.1

---
 srcpkgs/textadept/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/textadept/template b/srcpkgs/textadept/template
index 6078875b1d81..e49056c0cb54 100644
--- a/srcpkgs/textadept/template
+++ b/srcpkgs/textadept/template
@@ -1,6 +1,6 @@
 # Template file for 'textadept'
 pkgname=textadept
-version=11.0
+version=11.1
 revision=1
 wrksrc="textadept-textadept_${version}"
 build_wrksrc="src"
@@ -17,17 +17,17 @@ homepage="https://orbitalquark.github.io/textadept/"
 distfiles="https://github.com/orbitalquark/textadept/archive/textadept_${version}.tar.gz
  https://www.scintilla.org/scintilla445.tgz
  https://github.com/orbitalquark/scinterm/archive/6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip
- https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-1.zip
+ https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-2.zip
  https://www.lua.org/ftp/lua-5.3.5.tar.gz
  http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz
  https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip
  https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip
  https://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz
  http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"
-checksum="3d2ef169465dea85ce0b8bfa19522e96006abcb043cb58c3c3b74ca1bec9b9df
+checksum="87d67975b22952344e1bdcb330301b88cdfe8242e7710526cd344ab252499c2a
  4f2168684b4024dc3d6b267320fff1d729192047f4a1b79aeab9ec7c64f733ec
  3b1e3cc3ee48bb158d1d666c7c86d190905c973918914876f6ab3712f8dd7d20
- 045c1a9c7e8eb356a7cc54ddd49e994fd2d33469ab34385f2f794fd1e2babc24
+ ccd5b3d615116b8c4376086cf1d03b6ef1f67a565e57446b15eba3f39ef0c180
  0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
  48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe
  e3a6beca7a8a90522eed31db6ccdc5ed65a433826500c6862784e27671b9e18a
@@ -36,7 +36,7 @@ checksum="3d2ef169465dea85ce0b8bfa19522e96006abcb043cb58c3c3b74ca1bec9b9df
  6c0d87c94ab9915e76ecd313baec08dedf3bd56de83743d9aa923a081935d2f5"
 skip_extraction="scintilla445.tgz
  6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip
- scintillua_4.4.5-1.zip
+ scintillua_4.4.5-2.zip
  lua-5.3.5.tar.gz
  lpeg-1.0.2.tar.gz
  v1_8_0.zip

From ecdeb52c47522e9a9f68cf611da1092861b5554c Mon Sep 17 00:00:00 2001
From: ibrokemypie <ibrokemypie@bastardi.net>
Date: Mon, 22 Feb 2021 23:45:17 +1100
Subject: [PATCH 283/305] New package: droidcam-1.7.2.

Closes: #28972 [via git-merge-pr]
---
 srcpkgs/droidcam/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/droidcam/template

diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
new file mode 100644
index 000000000000..665811688867
--- /dev/null
+++ b/srcpkgs/droidcam/template
@@ -0,0 +1,28 @@
+# Template file for 'droidcam'
+pkgname=droidcam
+version=1.7.2
+revision=1
+build_style=gnu-makefile
+make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
+hostmakedepends="pkg-config"
+makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
+ speex-devel libusbmuxd-devel libplist-devel gtk+3-devel"
+depends="v4l2loopback"
+short_desc="Tool for using your android device as a wireless/usb webcam"
+maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
+license="GPL-2.0-or-later"
+homepage="https://www.dev47apps.com/"
+distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
+checksum=ea93a56f5e2291ea8546d047bb89c54f4b3ded3786d176a79148a62aaa0765e3
+
+post_patch() {
+	vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -i droidcam.desktop
+}
+
+do_install() {
+	vbin droidcam
+	vbin droidcam-cli
+	vinstall icon2.png 644 usr/share/pixmaps droidcam-icon.png
+	vinstall droidcam.desktop 644 usr/share/applications
+	vdoc README.md
+}

From 5b07ff8d70f42d7276957f3baae6d3e55f38c142 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 23 Mar 2021 23:08:51 +0100
Subject: [PATCH 284/305] parallel: update to 20210322.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 594eac9fbbf0..c20964551f88 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20210222
+version=20210322
 revision=1
 build_style=gnu-configure
 depends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=4e69b00aeb62f74ea2fdc6579d31d2b4a4cc0a64fe75cf61926312402f1be72b
+checksum=98f71b445a23a18bb4e9bce4f374b93e6a6d9decdf892be8d22459f224b85694
 
 pre_configure() {
 	# no html and pdf doc

From 627d64f3427dbfd46fb91d4879f95cb20e8e62b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 Mar 2021 00:11:02 +0100
Subject: [PATCH 285/305] sleuthkit: update to 4.10.2.

---
 srcpkgs/sleuthkit/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index 5c7a8bd39048..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.1
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -12,8 +12,9 @@ short_desc="File system and media management forensic analysis tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
-distfiles="https://github.com/sleuthkit/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=18e587f5f1869f9d87edc4e77e7d5ddcacfd0966d15e5fb45ce520b0fe9ff03e
+changelog="https://github.com/sleuthkit/sleuthkit/releases"
+distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h

From aeec8926703afdfe2baf693c2c325b63c04af02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 22 Mar 2021 21:42:35 +0700
Subject: [PATCH 286/305] nspr: update to 4.30.

---
 srcpkgs/nspr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index d6448f360dcc..b799a99633b4 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
 # Template file for 'nspr'
 pkgname=nspr
-version=4.29
+version=4.30
 revision=1
 build_wrksrc=nspr
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="http://www.mozilla.org/projects/nspr/"
 distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582
+checksum=8d4cd8f8409484dc4c3d31e180354bfc506573eccf86cd691106a1ef7edc913b
 
 do_configure() {
 	CFLAGS="$CFLAGS -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"

From 71b9570e6eb397b893a82ad1144d8a1ca62bfc20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 22 Mar 2021 21:42:49 +0700
Subject: [PATCH 287/305] nss: update to 3.63.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 8ded0c7ae530..5c766a79dd85 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.29
 
 pkgname=nss
-version=3.62
+version=3.63
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=86d6df7cece25b8d4efa53e4c19af903c484eb79871163f37b5232bb406a5478
+checksum=182d2fef629102ae9423aabf2c192242b565cf5098e82c5a26cf70c5e4ea2221
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 56ff8f4d066e80c46eb982f815635dff718cfd72 Mon Sep 17 00:00:00 2001
From: Phosu Parsons <38191182+phossil@users.noreply.github.com>
Date: Tue, 23 Mar 2021 21:20:07 -0500
Subject: [PATCH 288/305] discord: update to 0.0.14

---
 srcpkgs/discord/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/discord/template b/srcpkgs/discord/template
index 7e9e877652dd..3ff2cc9736b9 100644
--- a/srcpkgs/discord/template
+++ b/srcpkgs/discord/template
@@ -1,6 +1,6 @@
 # Template file for 'discord'
 pkgname=discord
-version=0.0.13
+version=0.0.14
 revision=1
 archs="x86_64"
 wrksrc="Discord"
@@ -10,7 +10,7 @@ maintainer="Ryan Conwell <ryanconwell@protonmail.com>"
 license="custom:Proprietary"
 homepage="https://discordapp.com"
 distfiles="https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"
-checksum=feeca83531607eec1a6231ad8eab88bbf1865c39cf5f82b884e3b5241733bf34
+checksum=c2651aef4b2c078a3d0975b82fd391571decaa636e52343bb4f116da1c4804e7
 repository=nonfree
 restricted=yes
 nopie=yes

From 86ec343d50cd47356d45bbea32fd84b9ebbb1b23 Mon Sep 17 00:00:00 2001
From: whoizit <whoami@systemli.org>
Date: Fri, 19 Mar 2021 20:51:07 +0300
Subject: [PATCH 289/305] yggdrasil: update to 0.3.16.

- partially revert service changes from
  c33aec8e707d49731c7b94996450d3ebb0178ce0, now that we ship a util-linux version
  that can always handle -all or +all with setpriv(1).
- remove TODO comment: switching to using a user + adding caps to it
  would break some setups and is no longer necessary. It also isn't the
  recommended setup from upstream.
---
 srcpkgs/yggdrasil/files/yggdrasil/run | 12 ++++--------
 srcpkgs/yggdrasil/template            |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/yggdrasil/files/yggdrasil/run b/srcpkgs/yggdrasil/files/yggdrasil/run
index 40460c8a1ef1..0c5e259b3ae5 100755
--- a/srcpkgs/yggdrasil/files/yggdrasil/run
+++ b/srcpkgs/yggdrasil/files/yggdrasil/run
@@ -1,13 +1,9 @@
 #!/bin/sh
 modprobe tun
-# limiting caps is temporarily disabled, as it breaks with
-# setpriv: libcap-ng is too old for "all" caps
-# TODO: instead of dropping all caps, start with a
-# non-priv user and manually add needed privileges instead.
-#caps='-all,+NET_ADMIN,+NET_RAW'
-#drop_caps="setpriv --inh-caps $caps --bounding-set $caps"
+caps='-all,+NET_ADMIN,+NET_RAW'
+drop_caps="setpriv --inh-caps $caps --bounding-set $caps"
 if [ -f /etc/yggdrasil.conf ]; then
-	exec yggdrasil -useconffile /etc/yggdrasil.conf 2>&1
+	exec $drop_caps yggdrasil -useconffile /etc/yggdrasil.conf 2>&1
 else
-	exec yggdrasil -autoconf 2>&1
+	exec $drop_caps yggdrasil -autoconf 2>&1
 fi
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 74c3c32537e0..4f7408506d1a 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,6 +1,6 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
-version=0.3.15
+version=0.3.16
 revision=1
 wrksrc="yggdrasil-go-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="LGPL-3.0-only"
 homepage="https://yggdrasil-network.github.io/"
 distfiles="https://github.com/yggdrasil-network/yggdrasil-go/archive/v${version}.tar.gz"
-checksum=25ea85399a142aa7a3d6f6886fd4e0d215116c4c8c33453de43999787d735565
+checksum=e03595b78906b171155aaa11c922be3418bd056f8547e4d9f5123b6047316eac
 
 do_build() {
 	PKGNAME=${pkgname} PKGVER=${version} ./build

From cf7156564de15a1c0388acc8331a7011feba47a7 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 23 Mar 2021 09:10:07 +0400
Subject: [PATCH 290/305] engrampa: update to 1.24.2.

---
 srcpkgs/engrampa/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template
index 4178d5dc2d1b..ac402d6fb4a9 100644
--- a/srcpkgs/engrampa/template
+++ b/srcpkgs/engrampa/template
@@ -1,6 +1,6 @@
 # Template file for 'engrampa'
 pkgname=engrampa
-version=1.24.1
+version=1.24.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --disable-schemas-compile --disable-packagekit"
@@ -10,11 +10,11 @@ makedepends="file-devel gtk+3-devel json-glib-devel libSM-devel libarchive-devel
  libcaja-devel"
 depends="desktop-file-utils cpio"
 short_desc="Archive manipulator for MATE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe24e04efb34a67374d2a46a3bf2a0a445b77e0ec43216e4c3f14e5cd0b7722a
+checksum=ee280d288c974732ec7bc2d1c3e18fa563b33a30f3e4cb3e976ebc71be6c4674
 
 pre_configure() {
 	autoreconf -fi

From 827083a2e9ce394e9b79f670bec8508dd04a71b7 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 23 Mar 2021 18:55:58 +0100
Subject: [PATCH 291/305] incron: add patch to fix create zombie processes

see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930526
---
 .../patches/incron-0.5.12-prevent-zombies.patch       | 11 +++++++++++
 srcpkgs/incron/template                               |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/incron/patches/incron-0.5.12-prevent-zombies.patch

diff --git a/srcpkgs/incron/patches/incron-0.5.12-prevent-zombies.patch b/srcpkgs/incron/patches/incron-0.5.12-prevent-zombies.patch
new file mode 100644
index 000000000000..63766c999509
--- /dev/null
+++ b/srcpkgs/incron/patches/incron-0.5.12-prevent-zombies.patch
@@ -0,0 +1,11 @@
+diff -Nur incron-0.5.12.orig/icd-main.cpp incron-0.5.12/icd-main.cpp
+--- incron-0.5.12.orig/icd-main.cpp	2019-01-05 11:43:19.722640603 -0800
++++ incron-0.5.12/icd-main.cpp	2019-01-05 11:45:41.236340779 -0800
+@@ -105,6 +105,7 @@
+       g_fFinish = true;
+       break;
+     case SIGCHLD:
++      do {} while (waitpid((pid_t)-1, 0, WNOHANG) > 0); /* Prevent zombies */
+       // first empty pipe (to prevent internal buffer overflow)
+       do {} while (read(g_cldPipe[0], g_cldPipeBuf, CHILD_PIPE_BUF_LEN) > 0);
+       
diff --git a/srcpkgs/incron/template b/srcpkgs/incron/template
index 19c08b4befaa..cd7e3f34eaed 100644
--- a/srcpkgs/incron/template
+++ b/srcpkgs/incron/template
@@ -1,13 +1,14 @@
 # Template file for 'incron'
 pkgname=incron
 version=0.5.12
-revision=2
+revision=3
 short_desc="Daemon that executes commands due to inotify events"
 maintainer="allan <mail@may.mooo.com>"
 license="X11"
 homepage="https://github.com/ar-/incron"
 distfiles="https://github.com/ar-/incron/archive/${version}.tar.gz"
 checksum=cce80bd723bafce59f35464f2f851d02707e32efa102e2b941ed0e42bdd38f91
+patch_args="-Np1"
 
 make_dirs="/var/spool/incron 0755 root root
  /etc/incron.d 0755 root root"

From f73eb11de8f096688e3ba6abc4444b9786daa668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 23:44:30 -0300
Subject: [PATCH 292/305] .github/workflows: add CI run to lock closed threads.

Closed PRs will be locked after 90 days of inactivity, to avoid comments
on old inactive threads and encourage people to create new ones, which
will receive the proper attention.

Inspired by hook from fish-shell:
https://github.com/fish-shell/fish-shell/blob/a36dbad3b82c36352c6cf9d4bbdc58c7bd46e18a/.github/workflows/lockthreads.yml
---
 .github/workflows/lockthreads.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/lockthreads.yml

diff --git a/.github/workflows/lockthreads.yml b/.github/workflows/lockthreads.yml
new file mode 100644
index 000000000000..11e571abf68c
--- /dev/null
+++ b/.github/workflows/lockthreads.yml
@@ -0,0 +1,14 @@
+name: 'Lock threads'
+
+on:
+  schedule:
+    - cron: '0 18 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ github.token }}
+          pr-lock-inactive-days: '90'

From 0201c58598c455f4141b34a39472f44e1c8e8ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 18 Mar 2021 14:29:32 -0300
Subject: [PATCH 293/305] CONTRIBUTING.md: be clearer about "one commit per PR"
 rule.

---
 CONTRIBUTING.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4cadfc6265b7..b68c4c601cd4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -41,7 +41,7 @@ If `xlint` reports any issues, resolve them before committing.
 
 ### Committing your changes
 
-Once you have built your template file or files, the commit message should have one of the following forms:
+Once you have made and verified your changes to the package template and/or other files, make one commit per package (including all changes to its sub-packages). Each commit message should have one of the following formats:
 
 * for new packages, use ```New package: <pkgname>-<version>``` ([example](https://github.com/void-linux/void-packages/commit/176d9655429188aac10cd229827f99b72982ab10)).
 
@@ -74,7 +74,7 @@ New packages will not be accepted unless they have been runtime tested.
 
 ### Starting a pull request
 
-Once you have successfully built the package, you can [create a pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
+Once you have successfully built the package, you can [create a pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request). Pull requests are also known as PRs.
 
 Most pull requests should only contain a single package and dependencies which are not part of void-packages yet.
 
@@ -99,11 +99,10 @@ comply with the our guidelines. At the moment not all packages comply with the r
 
 #### Review
 
-Most of the time your pull request will contain mistakes. It's nothing bad, it just happens.
+It's possible (and common) that a pull request will contain mistakes or reviewers will ask for additional tweaks.
+Reviewers will comment on your pull request and point out which changes are needed before the pull request can be merged.
 
-Reviewers will comment on your pull request and point out which changes are needed before the template can be included.
-
-We recommend having only a single commit for pull request, so if you need to make changes in commits but already have a pull request, use the following commands:
+Most PRs will have a single commit, as seen [above](#committing-your-changes), so if you need to make changes to the commit and already have a pull request open, you can use the following commands:
 
     $ git add <file>
     $ git commit --amend

From d8f6e4e217961aa117825960f630a8557a1cf729 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 22 Mar 2021 19:59:47 +0100
Subject: [PATCH 294/305] dbeaver: update to 21.0.1.

---
 srcpkgs/dbeaver/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 515ee4040c7e..0573665b8a32 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.0.0
+version=21.0.1
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=3924947380b5da47beb7494a5b82744a1fc183a838f912314f3e6f6089df2fb6
+checksum=f7ebd07bb85022d715df48e191f24293af23eadc29478c402fd67e871fa4dc0f
 nopie=true
 
 do_build() {
@@ -20,7 +20,7 @@ do_build() {
 
 do_install() {
 	vmkdir /usr/lib
-	vcopy "product/standalone/target/products/org.jkiss.dbeaver.core.product/linux/gtk/x86_64/dbeaver" /usr/lib/
+	vcopy "product/community/target/products/org.jkiss.dbeaver.core.product/linux/gtk/x86_64/dbeaver" /usr/lib/
 
 	vmkdir /usr/bin
 	ln -s /usr/lib/dbeaver/dbeaver ${DESTDIR}/usr/bin/dbeaver

From 906e239fedf9d3d6651b6de6ab9d2680043873ac Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Tue, 29 Dec 2020 20:43:09 +0000
Subject: [PATCH 295/305] python3-joblib: update to 1.0.1

---
 srcpkgs/python3-joblib/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-joblib/template b/srcpkgs/python3-joblib/template
index 29ff3b7f7bad..f19a6f4609ac 100644
--- a/srcpkgs/python3-joblib/template
+++ b/srcpkgs/python3-joblib/template
@@ -1,18 +1,24 @@
 # Template file for 'python3-joblib'
 pkgname=python3-joblib
-version=0.17.0
-revision=2
+version=1.0.1
+revision=1
 wrksrc="joblib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="python3"
+depends="python3 python3-psutil
+$(vopt_if array python3-numpy)
+$(vopt_if compression python3-lz4)"
 short_desc="Lightweight pipelining in Python"
 maintainer="Neel Chotai <neel@chot.ai>"
 license="BSD-3-Clause"
 homepage="https://joblib.readthedocs.io/"
 distfiles="https://github.com/joblib/joblib/archive/${version}.tar.gz"
-checksum=6dd8d75808624ac60434a3c6de4623dc49e4f9f3332501b467c36b0fbfdd54c9
+checksum=c930c58f0deacd22c525a64c4ba937b521dcb77493d5887b75bb4d204aa61a26
+make_check=extended
+
+build_options="array compression"
+build_options_default="array compression"
 
 post_install() {
 	vlicense LICENSE.txt

From 792f564c6616992184be44f1d1453bc38b55a80e Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Mon, 22 Mar 2021 20:39:01 -0700
Subject: [PATCH 296/305] python3-autobahn: update to 21.3.1.

---
 srcpkgs/python3-autobahn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-autobahn/template b/srcpkgs/python3-autobahn/template
index f2cb03efaa03..45397af2ecd4 100644
--- a/srcpkgs/python3-autobahn/template
+++ b/srcpkgs/python3-autobahn/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-autobahn'
 pkgname=python3-autobahn
-version=20.12.2
+version=21.3.1
 revision=1
 wrksrc="autobahn-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://crossbar.io/autobahn"
 distfiles="${PYPI_SITE}/a/autobahn/autobahn-${version}.tar.gz"
-checksum=72b68a1ce1e10e3cbcc3b280aae86d5b2e7a1f409febab1ab91a8a3274113f6e
+checksum=e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03
 
 do_check() {
 	# https://github.com/crossbario/autobahn-python/issues/1117

From ef0cfc0d34cd1cae06809dbcd18174e139165b48 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Mon, 22 Mar 2021 20:34:08 -0700
Subject: [PATCH 297/305] procs: update to 0.11.4.

---
 srcpkgs/procs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 17a0dc5e0527..f1f460f34e79 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
 # Template file for 'procs'
 pkgname=procs
-version=0.11.3
+version=0.11.4
 revision=1
 build_style=cargo
 short_desc="Modern replacement for ps written in Rust"
@@ -8,7 +8,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://github.com/dalance/procs"
 distfiles="https://github.com/dalance/procs/archive/v${version}.tar.gz"
-checksum=bf56fde52d0f6544a2ca3db6d4552867e5cf9daf1c5a31f8b3ad6e3258986b0f
+checksum=30a903374eb888b89cd43bbc19365aa24ef01b3588298ab246085dbe42c8e819
 
 post_install() {
 	vlicense LICENSE

From 6a26ce7bb2aed680a8f0fca35da5f75d14460bda Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Mon, 22 Mar 2021 20:30:42 -0700
Subject: [PATCH 298/305] dtrx: update to 8.1.0.

---
 srcpkgs/dtrx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dtrx/template b/srcpkgs/dtrx/template
index d8e44456da9a..51af829dd554 100644
--- a/srcpkgs/dtrx/template
+++ b/srcpkgs/dtrx/template
@@ -1,6 +1,6 @@
 # Template file for 'dtrx'
 pkgname=dtrx
-version=8.0.1
+version=8.1.0
 revision=1
 depends="python3"
 short_desc="Tool that takes all the hassle out of extracting archives"
@@ -8,7 +8,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dtrx-py/dtrx/"
 distfiles="https://github.com/dtrx-py/dtrx/archive/${version}.tar.gz"
-checksum=4c37b16b741785d1db17c4561da647a52a182472f12758a39a9f03518b9dd17f
+checksum=5610bc3cb8bf38e573af0b7bc3c21ef5093a98d934e60cf8c61dd864d98189bc
 python_version=3
 
 do_install() {

From 614f15e7522db750c32b9404ab03180a84b597e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Mar 2021 18:31:38 -0300
Subject: [PATCH 299/305] gettext: reorganize so gettext-libs only ships
 versioned libintl.so.

Move unrelated libraries to gettext package, since they are only used by
it and by gtranslator, which will for the most part be installed
alongside gtranslator already.

The main purpose with this PR is to stop shipping unversioned libintl.so
in gettext-libs. What happens in this case is that packages built
natively for musl with localization support will have gettext in
hostmakedepends, which will lead to gettext-libs being in the host, and,
consequently, /usr/lib/libintl.so being available.

Due to CMake's FindIntl being bad, CMake projects will assume they
should use libintl.so instead of the gettext support from libc, and link
against it unnecessarily (and sometimes innefectively: CMake points the
compiler at /usr/include/libintl.h instead of our
/usr/include/gettext/libintl.h, which means the musl header will be used
instead, and unless the main executable is linked against libintl, the
library's functions won't even be used). Leaving only the essential
libraries in gettext-libs (versioned libintl.so files) and guaranteeing
gettext doesn't pull in the unversioned one means many packages won't
depend on libintl unnecessarily any more. As a matter of fact, this is a
case where our cross builds were more "correct" than native ones, since
libintl.so in the host won't be found for the target.

Furthermore, some packages require autopoint(1) in order to run
autoreconf; to avoid depending on gettext-devel for it, and ending up
linking in libintl into the final binary, we split it into the
gettext-devel-tools subpackage as well.

Also pull in Alpine patches fixing test failures.
---
 common/shlibs                                 |  9 ++--
 srcpkgs/gettext-devel-tools                   |  1 +
 srcpkgs/gettext/patches/musl-realpath.patch   | 41 +++++++++++++++
 .../musl-unsupported-iconv-encoding.patch     | 44 ++++++++++++++++
 srcpkgs/gettext/template                      | 50 +++++++++++++++----
 5 files changed, 129 insertions(+), 16 deletions(-)
 create mode 120000 srcpkgs/gettext-devel-tools
 create mode 100644 srcpkgs/gettext/patches/musl-realpath.patch
 create mode 100644 srcpkgs/gettext/patches/musl-unsupported-iconv-encoding.patch

diff --git a/common/shlibs b/common/shlibs
index 4b82c3ced654..7319cc8d20cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -176,11 +176,10 @@ libxfce4panel-2.0.so.4 libxfce4panel-4.12.0_1
 libgdbm.so.6 gdbm-1.16_1
 libgdbm_compat.so.4 gdbm-1.10_1_1
 libintl.so.8 gettext-libs-0.19.2_1
-libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.21.so gettext-libs-0.21_1
-libgettextsrc-0.21.so gettext-libs-0.21_1
-libgettextpo.so.0 gettext-libs-0.17_1
-libtextstyle.so.0 gettext-libs-0.20.1_1
+libgettextlib-0.21.so gettext-0.21_3
+libgettextsrc-0.21.so gettext-0.21_3
+libtextstyle.so.0 gettext-0.21_3
+libgettextpo.so.0 gettext-0.21_3
 libattr.so.1 attr-2.4.43_1
 libacl.so.1 acl-2.2.47_1
 libpython2.7.so.1.0 python-2.7.18_3
diff --git a/srcpkgs/gettext-devel-tools b/srcpkgs/gettext-devel-tools
new file mode 120000
index 000000000000..d3a6700489c5
--- /dev/null
+++ b/srcpkgs/gettext-devel-tools
@@ -0,0 +1 @@
+gettext
\ No newline at end of file
diff --git a/srcpkgs/gettext/patches/musl-realpath.patch b/srcpkgs/gettext/patches/musl-realpath.patch
new file mode 100644
index 000000000000..75a650895e07
--- /dev/null
+++ b/srcpkgs/gettext/patches/musl-realpath.patch
@@ -0,0 +1,41 @@
+https://gitlab.alpinelinux.org/alpine/aports/-/issues/12295
+This patch is necessary only with musl after 1.2.2
+
+----
+test-canonicalize.c:339: assertion 'strcmp (result1, "/") == 0' failed
+Aborted (core dumped)
+FAIL test-canonicalize (exit status: 134)
+----
+
+diff --git a/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c b/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c
+index ff82981..17842e8 100644
+--- a/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c
++++ b/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c
+@@ -208,8 +208,8 @@ main (void)
+ #ifndef __MVS__
+     if (SAME_INODE (st1, st2))
+       {
+-        ASSERT (strcmp (result1, "/") == 0);
+-        ASSERT (strcmp (result2, "/") == 0);
++        ASSERT (strcmp (result1, "/") == 0 || strcmp (result1, "//") == 0);
++        ASSERT (strcmp (result2, "/") == 0 || strcmp (result2, "//") == 0);
+       }
+     else
+ #endif
+--- a/gettext-tools/gnulib-tests/test-canonicalize.c
++++ b/gettext-tools/gnulib-tests/test-canonicalize.c
+@@ -336,10 +336,10 @@
+     ASSERT (stat ("//", &st2) == 0);
+     if (SAME_INODE (st1, st2))
+       {
+-        ASSERT (strcmp (result1, "/") == 0);
+-        ASSERT (strcmp (result2, "/") == 0);
+-        ASSERT (strcmp (result3, "/") == 0);
+-        ASSERT (strcmp (result4, "/") == 0);
++        ASSERT (strcmp (result1, "/") == 0 || strcmp (result1, "//") == 0);
++        ASSERT (strcmp (result2, "/") == 0 || strcmp (result2, "//") == 0);
++        ASSERT (strcmp (result3, "/") == 0 || strcmp (result3, "//") == 0);
++        ASSERT (strcmp (result4, "/") == 0 || strcmp (result4, "//") == 0);
+       }
+     else
+       {
diff --git a/srcpkgs/gettext/patches/musl-unsupported-iconv-encoding.patch b/srcpkgs/gettext/patches/musl-unsupported-iconv-encoding.patch
new file mode 100644
index 000000000000..de9a6b02b3a4
--- /dev/null
+++ b/srcpkgs/gettext/patches/musl-unsupported-iconv-encoding.patch
@@ -0,0 +1,44 @@
+As upstream notes:
+
+# Note: This test fails on Linux with musl libc versions that don't support
+# the BIG5 encoding in 'iconv'.
+
+diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2
+index d286cda..d96c487 100755
+--- a/gettext-tools/tests/msgconv-2
++++ b/gettext-tools/tests/msgconv-2
+@@ -7,6 +7,8 @@
+ # Note: This test fails on Linux with musl libc versions that don't support
+ # the BIG5 encoding in 'iconv'.
+ 
++Exit 77
++
+ cat <<\EOF > mco-test2.po
+ # Chinese translation for GNU gettext messages.
+ #
+diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6
+index 0afbe1e..1b2fe6b 100755
+--- a/gettext-tools/tests/msgmerge-compendium-6
++++ b/gettext-tools/tests/msgmerge-compendium-6
+@@ -10,6 +10,8 @@
+ # Note: This test fails on Linux with musl libc versions that don't support
+ # the EUC-KR encoding in 'iconv'.
+ 
++Exit 77
++
+ : ${MSGCONV=msgconv}
+ ${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$wabs_srcdir"/mm-ko.ascii.pot
+ 
+diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3
+index ca0926d..2c49fd7 100755
+--- a/gettext-tools/tests/xgettext-python-3
++++ b/gettext-tools/tests/xgettext-python-3
+@@ -6,6 +6,8 @@
+ # Note: This test fails on Linux with musl libc versions that don't support
+ # the EUC-JP encoding in 'iconv'.
+ 
++Exit 77
++
+ cat <<\EOF > xg-py-3a.py
+ #!/usr/bin/env python
+ # TRANSLATORS: Fran«®ois Pinard is a hero.
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 06079609ba0f..3c8250b976be 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
 # Template file for 'gettext'
 pkgname=gettext
 version=0.21
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-java --disable-native-java --disable-csharp
  --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -22,11 +22,20 @@ homepage="https://www.gnu.org/software/gettext/"
 changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12
+patch_args=-Np1
 
-case "$XBPS_TARGET_MACHINE" in
+subpackages="gettext-devel-examples gettext-devel gettext-devel-tools"
+unset _intl_lib
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	# force libintl
-	*-musl) configure_args+=" --with-included-gettext";;
-esac
+	configure_args+=" --with-included-gettext"
+	subpackages+=" gettext-libs"
+	_intl_lib=intl
+else
+	# on glibc, old gettext-libs conflicts with gettext
+	replaces="gettext-libs>=0"
+	conflicts="gettext-libs>=0"
+fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool"
@@ -35,10 +44,9 @@ if [ "$CROSS_BUILD" ]; then
 	}
 fi
 
-
 post_install() {
-	# Fix conflict with musl.
-	if [ -e ${DESTDIR}/usr/include/libintl.h ]; then
+	# don't overwrite musl's header
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
 		vmkdir usr/include/gettext
 		mv ${DESTDIR}/usr/include/libintl.h ${DESTDIR}/usr/include/gettext/libintl.h
 	fi
@@ -50,22 +58,42 @@ gettext-devel-examples_package() {
 		vmove usr/share/doc/gettext
 	}
 }
+
 gettext-devel_package() {
-	depends="gettext-libs>=${version}_${revision} xz tar"
+	depends="${sourcepkg}>=${version}_${revision}
+	 gettext-devel-tools>=${version}_${revision} xz tar"
+	if [ -n "${_intl_lib}" ]; then
+		depends+=" gettext-libs>=${version}_${revision}"
+	fi
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/share/aclocal
+		vmove "usr/lib/*.a"
+		# libgettext{lib,src}-$version.so need to be in the main package
+		for _lib in ${_intl_lib} gettextlib gettextpo gettextsrc textstyle
+		do
+			vmove "usr/lib/lib${_lib}.so"
+		done
 		vmove usr/share/gettext
 		vmove usr/share/man/man3
+	}
+}
+
+gettext-devel-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development tools"
+	pkg_install() {
+		vmove usr/share/aclocal
 		vmove usr/bin/autopoint
 		vmove usr/bin/gettextize
+		vmove usr/share/man/man1/autopoint.1
+		vmove usr/share/man/man1/gettextize.1
 	}
 }
+
 gettext-libs_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
-		vmove usr/lib/*.so*
+		vmove "usr/lib/libintl.so.*"
 	}
 }

From a73c8125453d99f90f3165c230a91ae4f580fcb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Mar 2021 18:46:28 -0300
Subject: [PATCH 300/305] gtranslator: revbump for gettext re-org.

---
 srcpkgs/gtranslator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index d0c49d1d778b..f9f9d0e3bc13 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,7 +1,7 @@
 # Template file for 'gtranslator'
 pkgname=gtranslator
 version=3.38.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel itstool"
 makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel

From de977cc54c896e7a3f93d1233c5e5d70d7a928f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Mar 2021 18:53:22 -0300
Subject: [PATCH 301/305] fish: don't link against libintl.

---
 srcpkgs/fish-shell/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index c39fd784c423..800a781f214e 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,11 +1,11 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
 version=3.2.1
-revision=1
+revision=2
 wrksrc="fish-${version}"
 build_style=cmake
 hostmakedepends="gettext"
-makedepends="ncurses-devel pcre2-devel gettext-devel"
+makedepends="ncurses-devel pcre2-devel"
 depends="groff"
 checkdepends="python3-pexpect procps-ng"
 short_desc="User friendly shell intended mostly for interactive use"
@@ -15,6 +15,8 @@ homepage="https://fishshell.com/"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
 checksum=d8e49f4090d3778df17dd825e4a2a80192015682423cd9dd02b6675d65c3af5b
 register_shell="/bin/fish /usr/bin/fish"
+# tests don't work as root
+make_check=extended
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 365e9b0e1bed73983f936b00b1fcabdc5e327879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Mar 2021 22:40:16 -0300
Subject: [PATCH 302/305] inkscape: don't link against libintl for native
 builds.

---
 srcpkgs/inkscape/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index dd549fae36c6..364f229dba30 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,13 +1,13 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.0.2
-revision=1
+revision=2
 wrksrc="inkscape-${version}_2021-01-15_e86c870879"
 build_style=cmake
 # builds executables then runs checks
 # FIXME: some tests still fail on musl
 make_check_target=check
-hostmakedepends="automake pkg-config libtool intltool gettext-devel
+hostmakedepends="automake pkg-config libtool intltool gettext
  glib-devel perl-XML-Parser tar which xz"
 makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel

From ca784e439f6c3de9f63429abae66186a0fe9b365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Mar 2021 23:07:39 -0300
Subject: [PATCH 303/305] gnutls: don't link against libintl in native builds.

Also remove autoreconf, not necessary for now when configure.ac isn't
being patched.
---
 srcpkgs/gnutls/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8cf..69c6ebecc7d3 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,13 +1,15 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.15
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-zlib --disable-guile --disable-static
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="gettext libtool pkg-config which"
+# for autoreconf
+#hostmakedepends+=" gettext-devel-tools automake"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
  libunistring-devel unbound-devel trousers-devel"
@@ -19,10 +21,6 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
 
-pre_configure() {
-	autoreconf -vfi
-}
-
 pre_check() {
 	# same as $PASS in tests/cert-tests/certtool
 	export GNUTLS_PIN=1234

From 14d8b646de6b391de0efff4c0528a34f01212d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Mar 2021 22:42:05 -0300
Subject: [PATCH 304/305] weechat: generate translations and don't link against
 libintl.

The gnutls-devels -> gnutls -> gettext-libs chain pulled in libintl.so,
which ended up unnecessarily linked into the binary.

Ironically, no localization files were generated, because gettext wasn't
in hostmakedepends.
---
 srcpkgs/weechat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index eaa22c6a06d4..ce42c986b260 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,12 +1,13 @@
 # Template file for 'weechat'
 pkgname=weechat
 version=3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
  -DENABLE_GUILE=OFF -DENABLE_PHP=OFF -DENABLE_JAVASCRIPT=OFF"
-hostmakedepends="ruby-asciidoctor libgcrypt-devel pkg-config python3 tcl-devel"
+hostmakedepends="ruby-asciidoctor libgcrypt-devel pkg-config python3 tcl-devel
+ gettext"
 makedepends="aspell-devel gnutls-devel libcurl-devel lua53-devel ncurses-devel
  perl python3-devel ruby-devel tcl-devel"
 depends="ca-certificates"

From 60e290915b9ac15b0873ed5e7bc6bb0c8f731cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 23 Mar 2021 15:05:18 -0300
Subject: [PATCH 305/305] glib: update to 2.66.8.

---
 srcpkgs/docker-cli/update | 1 -
 srcpkgs/glib/template     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
deleted file mode 100644
index 2402ccb6eb59..000000000000
--- a/srcpkgs/docker-cli/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 942720feaa43..6cba65bad221 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.7
+version=2.66.8
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=09f158769f6f26b31074e15b1ac80ec39b13b53102dfae66cfe826fb2cc65502
+checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (87 preceding siblings ...)
  2021-03-24 13:26 ` radiden
@ 2021-03-24 13:26 ` radiden
  2021-03-25 15:17 ` endigma
                   ` (6 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: radiden @ 2021-03-24 13:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by radiden against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 11403 bytes --]

From cd8d424157622da2e50452ae56d7de12877fb8e1 Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 20:37:57 +0100
Subject: [PATCH 1/2] docker: split package, update to 20.10.5

New package: docker-cli-20.10.5
New package: moby-20.10.5
---
 srcpkgs/docker                                |   1 +
 srcpkgs/docker-cli/template                   |  30 ++++
 srcpkgs/docker-cli/update                     |   1 +
 srcpkgs/docker/template                       | 138 ------------------
 srcpkgs/docker/update                         |   1 -
 srcpkgs/{docker => moby}/files/docker/log/run |   0
 srcpkgs/{docker => moby}/files/docker/run     |   0
 srcpkgs/moby/template                         |  51 +++++++
 srcpkgs/moby/update                           |   1 +
 9 files changed, 84 insertions(+), 139 deletions(-)
 create mode 120000 srcpkgs/docker
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 delete mode 100644 srcpkgs/docker/template
 delete mode 100644 srcpkgs/docker/update
 rename srcpkgs/{docker => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker => moby}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/moby/template
 create mode 100644 srcpkgs/moby/update

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..1f54c86ca232
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..747f2c67ca81
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,30 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+wrksrc="cli-${version}"
+build_style=go
+go_package="github.com/docker/cli/cmd/docker"
+go_import_path="github.com/docker/cli"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} moby"
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..2402ccb6eb59
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index e0830515a33e..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,138 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=19.03.15
-revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/moby/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
new file mode 100644
index 000000000000..6d8ef4e83729
--- /dev/null
+++ b/srcpkgs/moby/template
@@ -0,0 +1,51 @@
+# Template file for 'moby'
+pkgname=moby
+version=20.10.5
+revision=1
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd iptables xz"
+short_desc="Container engine for the Docker ecosystem"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+ https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/moby/update b/srcpkgs/moby/update
new file mode 100644
index 000000000000..3ff71c71f1f2
--- /dev/null
+++ b/srcpkgs/moby/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From bb9db89557a12875a3509416ad8a868ff23b0a3b Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Wed, 24 Mar 2021 14:19:11 +0100
Subject: [PATCH 2/2] docker-cli: remove useless update file

---
 srcpkgs/docker-cli/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
deleted file mode 100644
index 2402ccb6eb59..000000000000
--- a/srcpkgs/docker-cli/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="v\K[\d\.]+(?=\.tar\.gz)"

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (88 preceding siblings ...)
  2021-03-24 13:26 ` radiden
@ 2021-03-25 15:17 ` endigma
  2021-03-31  2:38 ` endigma
                   ` (5 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-25 15:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-806933068

Comment:
Anything further?

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (89 preceding siblings ...)
  2021-03-25 15:17 ` endigma
@ 2021-03-31  2:38 ` endigma
  2021-03-31 18:42 ` [PR PATCH] [Updated] " endigma
                   ` (4 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-31  2:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-810713843

Comment:
What are we waiting on?

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Updated] docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (90 preceding siblings ...)
  2021-03-31  2:38 ` endigma
@ 2021-03-31 18:42 ` endigma
  2021-03-31 18:42 ` endigma
                   ` (3 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-31 18:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 12764 bytes --]

From cd8d424157622da2e50452ae56d7de12877fb8e1 Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 20:37:57 +0100
Subject: [PATCH 1/4] docker: split package, update to 20.10.5

New package: docker-cli-20.10.5
New package: moby-20.10.5
---
 srcpkgs/docker                                |   1 +
 srcpkgs/docker-cli/template                   |  30 ++++
 srcpkgs/docker-cli/update                     |   1 +
 srcpkgs/docker/template                       | 138 ------------------
 srcpkgs/docker/update                         |   1 -
 srcpkgs/{docker => moby}/files/docker/log/run |   0
 srcpkgs/{docker => moby}/files/docker/run     |   0
 srcpkgs/moby/template                         |  51 +++++++
 srcpkgs/moby/update                           |   1 +
 9 files changed, 84 insertions(+), 139 deletions(-)
 create mode 120000 srcpkgs/docker
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 delete mode 100644 srcpkgs/docker/template
 delete mode 100644 srcpkgs/docker/update
 rename srcpkgs/{docker => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker => moby}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/moby/template
 create mode 100644 srcpkgs/moby/update

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..1f54c86ca232
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..747f2c67ca81
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,30 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+wrksrc="cli-${version}"
+build_style=go
+go_package="github.com/docker/cli/cmd/docker"
+go_import_path="github.com/docker/cli"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} moby"
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..2402ccb6eb59
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index e0830515a33e..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,138 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=19.03.15
-revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/moby/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
new file mode 100644
index 000000000000..6d8ef4e83729
--- /dev/null
+++ b/srcpkgs/moby/template
@@ -0,0 +1,51 @@
+# Template file for 'moby'
+pkgname=moby
+version=20.10.5
+revision=1
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd iptables xz"
+short_desc="Container engine for the Docker ecosystem"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+ https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/moby/update b/srcpkgs/moby/update
new file mode 100644
index 000000000000..3ff71c71f1f2
--- /dev/null
+++ b/srcpkgs/moby/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

From bb9db89557a12875a3509416ad8a868ff23b0a3b Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Wed, 24 Mar 2021 14:19:11 +0100
Subject: [PATCH 2/4] docker-cli: remove useless update file

---
 srcpkgs/docker-cli/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/docker-cli/update

diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
deleted file mode 100644
index 2402ccb6eb59..000000000000
--- a/srcpkgs/docker-cli/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="v\K[\d\.]+(?=\.tar\.gz)"

From 28231526cceacd9b1bf4445358abf16f116f5bc0 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Wed, 31 Mar 2021 15:41:45 -0300
Subject: [PATCH 3/4] docker-cli: update to 20.10.5.

---
 srcpkgs/docker-cli/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 747f2c67ca81..88db6440de5e 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -23,6 +23,12 @@ pre_build() {
 	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
 }
 
+post_install() {
+	vcompletion contrib/completion/fish/docker.fish fish
+	vcompletion contrib/completion/zsh/_docker zsh
+	vcompletion contrib/completion/bash/docker bash
+}
+
 docker_package() {
 	build_style="meta"
 	short_desc="Docker container runtime"

From 440f40e0f08ccba8766392c81228cbefe1bcfae5 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Wed, 31 Mar 2021 15:41:52 -0300
Subject: [PATCH 4/4] moby: update to 20.10.5.

---
 srcpkgs/moby/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/moby/update

diff --git a/srcpkgs/moby/update b/srcpkgs/moby/update
deleted file mode 100644
index 3ff71c71f1f2..000000000000
--- a/srcpkgs/moby/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (91 preceding siblings ...)
  2021-03-31 18:42 ` [PR PATCH] [Updated] " endigma
@ 2021-03-31 18:42 ` endigma
  2021-03-31 18:43 ` endigma
                   ` (2 subsequent siblings)
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-31 18:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-811333744

Comment:
I can forcibly squash the commits but it's down to just Update messages now I think.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (92 preceding siblings ...)
  2021-03-31 18:42 ` endigma
@ 2021-03-31 18:43 ` endigma
  2021-04-01 18:50 ` ahesford
  2021-04-01 18:50 ` [PR PATCH] [Closed]: " ahesford
  95 siblings, 0 replies; 97+ messages in thread
From: endigma @ 2021-03-31 18:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

New comment by endigma on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-811333744

Comment:
I can forcibly squash the commits but it's down to just Update messages now I think. I just used xbump for those last two.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (93 preceding siblings ...)
  2021-03-31 18:43 ` endigma
@ 2021-04-01 18:50 ` ahesford
  2021-04-01 18:50 ` [PR PATCH] [Closed]: " ahesford
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-04-01 18:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29326#issuecomment-812103251

Comment:
Closed in 9b3c344a79a1930062ec7a0df22882f3a04127ec; I squashed the commits for you.

^ permalink raw reply	[flat|nested] 97+ messages in thread

* Re: [PR PATCH] [Closed]: docker: refactor, update, segment
  2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
                   ` (94 preceding siblings ...)
  2021-04-01 18:50 ` ahesford
@ 2021-04-01 18:50 ` ahesford
  95 siblings, 0 replies; 97+ messages in thread
From: ahesford @ 2021-04-01 18:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]

There's a closed pull request on the void-packages repository

docker: refactor, update, segment
https://github.com/void-linux/void-packages/pull/29326

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



^ permalink raw reply	[flat|nested] 97+ messages in thread

end of thread, other threads:[~2021-04-01 18:50 UTC | newest]

Thread overview: 97+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-08 18:30 [PR PATCH] docker: refactor, update, segment endigma
2021-03-08 18:56 ` endigma
2021-03-08 19:08 ` [PR PATCH] [Updated] " endigma
2021-03-08 19:10 ` endigma
2021-03-08 19:10 ` endigma
2021-03-08 19:12 ` [PR PATCH] [Updated] " endigma
2021-03-08 19:36 ` endigma
2021-03-08 19:37 ` endigma
2021-03-08 19:38 ` endigma
2021-03-11 21:04 ` [PR REVIEW] " ericonr
2021-03-11 21:04 ` ericonr
2021-03-11 21:04 ` ericonr
2021-03-11 21:04 ` ericonr
2021-03-11 21:04 ` ericonr
2021-03-11 23:56 ` [PR REVIEW] " endigma
2021-03-12  0:00 ` endigma
2021-03-12  0:00 ` endigma
2021-03-12  0:01 ` endigma
2021-03-12  0:02 ` [PR REVIEW] " endigma
2021-03-12  0:02 ` endigma
2021-03-12  0:03 ` [PR PATCH] [Updated] " endigma
2021-03-12  0:05 ` endigma
2021-03-12  0:07 ` [PR PATCH] [Updated] " endigma
2021-03-12  0:13 ` endigma
2021-03-12  0:15 ` endigma
2021-03-12  0:25 ` [PR REVIEW] " sgn
2021-03-12  1:03 ` [PR PATCH] [Updated] " endigma
2021-03-12  2:00 ` [PR REVIEW] " ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:00 ` ahesford
2021-03-12  2:19 ` ericonr
2021-03-12  3:35 ` endigma
2021-03-12  3:39 ` endigma
2021-03-12  3:39 ` endigma
2021-03-12  3:41 ` endigma
2021-03-12  3:42 ` endigma
2021-03-12  3:47 ` endigma
2021-03-12  3:47 ` endigma
2021-03-12  3:49 ` endigma
2021-03-12  3:50 ` endigma
2021-03-12  3:57 ` endigma
2021-03-12  4:00 ` endigma
2021-03-12  4:01 ` endigma
2021-03-12  4:02 ` endigma
2021-03-12  4:02 ` endigma
2021-03-12  4:14 ` endigma
2021-03-12  4:14 ` endigma
2021-03-12  4:21 ` endigma
2021-03-12  4:22 ` endigma
2021-03-12  4:22 ` endigma
2021-03-12  4:23 ` endigma
2021-03-12  4:24 ` endigma
2021-03-12  4:24 ` endigma
2021-03-12  4:30 ` ahesford
2021-03-12  4:30 ` ahesford
2021-03-12  4:30 ` ahesford
2021-03-12  4:30 ` ahesford
2021-03-12  4:30 ` endigma
2021-03-12  4:34 ` [PR PATCH] [Updated] " endigma
2021-03-12  4:36 ` endigma
2021-03-12  4:37 ` [PR REVIEW] " endigma
2021-03-12  4:43 ` [PR PATCH] [Updated] " endigma
2021-03-12  4:43 ` [PR REVIEW] " endigma
2021-03-12  4:48 ` endigma
2021-03-12  4:48 ` endigma
2021-03-12  4:51 ` [PR PATCH] [Updated] " endigma
2021-03-16 15:51 ` endigma
2021-03-16 15:55 ` endigma
2021-03-16 17:24 ` [PR PATCH] [Updated] " rainyuu
2021-03-16 17:26 ` [PR REVIEW] " endigma
2021-03-16 17:26 ` endigma
2021-03-16 17:40 ` [PR PATCH] [Updated] " rainyuu
2021-03-16 18:41 ` rainyuu
2021-03-20 14:42 ` endigma
2021-03-20 15:25 ` dm17
2021-03-20 15:40 ` ahesford
2021-03-20 16:04 ` endigma
2021-03-21  5:40 ` [PR REVIEW] " sgn
2021-03-24 13:10 ` [PR PATCH] [Updated] " radiden
2021-03-24 13:19 ` radiden
2021-03-24 13:26 ` radiden
2021-03-24 13:26 ` radiden
2021-03-25 15:17 ` endigma
2021-03-31  2:38 ` endigma
2021-03-31 18:42 ` [PR PATCH] [Updated] " endigma
2021-03-31 18:42 ` endigma
2021-03-31 18:43 ` endigma
2021-04-01 18:50 ` ahesford
2021-04-01 18:50 ` [PR PATCH] [Closed]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).