Re: [PR PATCH] [Updated] cni, buildah, containers.image updates

[CameronNemo <CameronNemo@users.noreply.github.com>]

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

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

https://github.com/CameronNemo/void-packages containers
https://github.com/void-linux/void-packages/pull/39304

cni, buildah, containers.image updates
- cni: update to 1.1.2
  - NOTE: the cni tool itself, not any of the plugins, is being updated
- containers.image: update to 5.22.0
  - NOTE: as discussed in IRC, dropping the patch to add docker.io to the search path by default
- buildah: update to 1.27.1

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39304.patch is attached

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

From cd17a25c858166c6748e5cdf36bddf2f67acb962 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 15 Sep 2022 11:31:54 -0700
Subject: [PATCH 1/3] containers.image: update to 5.22.0

Dropping the patch to add docker.io search path.

Upstream strongly recommends:

* using fully qualified names
* not adding registries that allow anonymous uploads

Adding the docker.io registry to the search path, according to the
RedHat containers team, substantially decreases the security of their
tools that Void Linux distributes.

This is a breaking change. Users will need to use "docker.io/<img>" to
pull/run images from now on, or add docker.io to the search path
themselves.
---
 srcpkgs/containers.image/patches/dockerhub.patch | 11 -----------
 srcpkgs/containers.image/template                |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/containers.image/patches/dockerhub.patch

diff --git a/srcpkgs/containers.image/patches/dockerhub.patch b/srcpkgs/containers.image/patches/dockerhub.patch
deleted file mode 100644
index 99482c3f0b56..000000000000
--- a/srcpkgs/containers.image/patches/dockerhub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/registries.conf
-+++ b/registries.conf
-@@ -9,7 +9,7 @@
- # Registries to search for images that are not fully-qualified.
- # i.e. foobar.com/my_image:latest vs my_image:latest
- [registries.search]
--registries = []
-+registries = ['docker.io']
- 
- # Registries that do not use TLS when pulling images or uses self-signed
- # certificates.
diff --git a/srcpkgs/containers.image/template b/srcpkgs/containers.image/template
index f587e0ef3640..ce6a9821dadd 100644
--- a/srcpkgs/containers.image/template
+++ b/srcpkgs/containers.image/template
@@ -1,6 +1,6 @@
 # Template file for 'containers.image'
 pkgname=containers.image
-version=5.0.0
+version=5.22.0
 revision=1
 wrksrc="image-${version}"
 conf_files="/etc/containers/registries.conf /etc/containers/policy.json"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/image"
 distfiles="https://github.com/containers/image/archive/v${version}.tar.gz"
-checksum=99440d59728ed741e6171046cf3a6a820c2e3414cd9c17ee640efd289a015c3f
+checksum=5333fdb1b913250ff9f5f8bf13f986a36a82a9ef79132fc1a5d850ac95b3428d
 
 do_build() {
 	mkdir -p build

From 8d5cd93a84b775b76c40e48643dd0e5ad903a3af Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 15 Sep 2022 11:34:43 -0700
Subject: [PATCH 2/3] cni: update to 1.1.2

---
 srcpkgs/cni/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index 85e011c19d45..1a49580d1c28 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,6 +1,6 @@
 # Template file for 'cni'
 pkgname=cni
-version=1.0.1
+version=1.1.2
 revision=1
 build_style=go
 go_import_path="github.com/containernetworking/cni"
@@ -10,4 +10,11 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containernetworking/cni"
 distfiles="https://github.com/containernetworking/cni/archive/v${version}.tar.gz"
-checksum=0e5376f70fb36c26935ddfb90b0da69736592ba8b577fbfb904750034c053d3b
+checksum=7d4bcaf83acdd54b3dc216f7aa5b5e1b32cb797d9c6af601a2c26b97470ed743
+
+post_install() {
+	for _doc in Documentation/*.md cnitool/README.md
+	do
+		vdoc "$_doc"
+	done
+}

From 7390ad60945adbdb7e700341a89d1e8b9903d5e9 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 15 Sep 2022 11:35:42 -0700
Subject: [PATCH 3/3] buildah: update to 1.28.0

---
 srcpkgs/buildah/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index b56a4ea1dff4..b855ef37d623 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.24.3
+version=1.28.0
 revision=1
 build_style=go
 go_import_path=github.com/containers/buildah
@@ -16,7 +16,7 @@ license="Apache-2.0"
 homepage="https://github.com/containers/buildah"
 changelog="https://github.com/containers/buildah/blob/master/CHANGELOG.md"
 distfiles="https://github.com/containers/buildah/archive/refs/tags/v${version}.tar.gz"
-checksum=664e2aec0e07df9668c6d41de540e84dc2447950cf952851ca9717a10cc46124
+checksum=4e406a0cc6a90066cd471deea252fe8862dbd7fa9cb72b274617673d6159a32b
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man