From a841c44952f620642097cf8df02f26a2ff1d306a Mon Sep 17 00:00:00 2001 From: Luca Matei Pintilie Date: Sat, 20 Apr 2024 18:38:43 +0200 Subject: [PATCH 1/2] podman: update to 5.0.2. Closes: #49936 [via git-merge-pr] --- srcpkgs/podman/template | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index 2d96648e291fb2..e11f13ea583d15 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,12 +1,12 @@ # Template file for 'podman' pkgname=podman -version=4.9.3 +version=5.0.2 revision=1 build_style=go -go_import_path="github.com/containers/podman/v4" +go_import_path="github.com/containers/podman/v5" go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport" go_build_tags="seccomp apparmor containers_image_ostree_stub" -hostmakedepends="pkg-config go-md2man python3" +hostmakedepends="pkg-config go-md2man python3 mdocml" makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel" depends="runc conmon cni-plugins slirp4netns fuse-overlayfs containers-common containers.image containers.storage" @@ -16,16 +16,26 @@ 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=37afc5bba2738c68dc24400893b99226c658cc9a2b22309f4d7abe7225d8c437 +checksum=85c3f70a1c293ccf48907d8e9fe13c6c9aac67242525a539296beeef31ba11a8 if [ "$CROSS_BUILD" ]; then go_build_tags+=" containers_image_openpgp" fi +case $XBPS_TARGET_MACHINE in + aarch64* | x86_64*) ;; + *) make_check="no" ;; # Upstream only supports tests on aarch64 and x86_64 +esac + post_build() { make docs } +do_check() { + make .install.ginkgo + make localunit +} + post_install() { vmkdir usr/libexec/podman mv "${DESTDIR}/usr/bin/rootlessport" "${DESTDIR}/usr/libexec/podman/rootlessport" From 9f7429646f285b7822c0098ceccb1a96b1266091 Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 14 Jun 2024 22:28:26 +0200 Subject: [PATCH 2/2] podman: update to 5.1.1. --- srcpkgs/podman/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index e11f13ea583d15..1399a3cb98e31d 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,22 +1,23 @@ # Template file for 'podman' pkgname=podman -version=5.0.2 +version=5.1.1 revision=1 build_style=go go_import_path="github.com/containers/podman/v5" go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport" -go_build_tags="seccomp apparmor containers_image_ostree_stub" +go_build_tags="seccomp apparmor containers_image_ostree_stub cni" hostmakedepends="pkg-config go-md2man python3 mdocml" makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel" -depends="runc conmon cni-plugins slirp4netns fuse-overlayfs - containers-common containers.image containers.storage" +depends="runc conmon cni-plugins slirp4netns fuse-overlayfs containers-common + containers.image containers.storage netavark passt" +checkdepends="qemu" short_desc="Simple management tool for containers and images" 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=85c3f70a1c293ccf48907d8e9fe13c6c9aac67242525a539296beeef31ba11a8 +checksum=ba1022c467dbc3e551e4d391dc6a5c03f33040a0764304b334afd7c6217c4894 if [ "$CROSS_BUILD" ]; then go_build_tags+=" containers_image_openpgp"