From ce64558a90cd8de1caa3e8c9b53fdd830bb77529 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Wed, 7 Sep 2022 10:02:38 -0700 Subject: [PATCH 1/4] podman: update to 4.2.1 --- srcpkgs/podman/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index 3b07673c4e23..c20c2e1be699 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,6 +1,6 @@ # Template file for 'podman' pkgname=podman -version=4.2.0 +version=4.2.1 revision=1 build_style=go go_import_path="github.com/containers/podman/v4" @@ -10,12 +10,12 @@ hostmakedepends="pkg-config go-md2man" 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 " +maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://podman.io/" changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md" distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz" -checksum=15f8bc59025ccd97dc9212a552e7274dfb79e1633b02d6a2a7f63d747eadb2f4 +checksum=b10004e91a9f5528da450466ec8e6f623eaa28ada79e3044c238895b2c8d1df3 if [ "$CROSS_BUILD" ]; then go_build_tags+=" containers_image_openpgp" From 361d98895585c3fcee4f1af8dd7c7cb8e2e94c67 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 15 Sep 2022 11:31:54 -0700 Subject: [PATCH 2/4] 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/" 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 " 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 50f5445cb7bfff54cb344b5bde95b9bdd9e0d075 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 15 Sep 2022 11:34:43 -0700 Subject: [PATCH 3/4] 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 " 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 c6cac150401333a172a5ba6fe453b5849aa6ce58 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 15 Sep 2022 11:35:42 -0700 Subject: [PATCH 4/4] buildah: update to 1.27.1 --- srcpkgs/buildah/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template index b56a4ea1dff4..ffa2f251e50c 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.27.1 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=8d636758658273b9d7ff202b6a9a123710cf94b672d3c32c4f4a00cd97eb6e17 post_build() { make -C docs GOMD2MAN=go-md2man