[PR PATCH] podman: update to 5.1.1.

[PR PATCH] podman: update to 5.1.1.

[lemmi]

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

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

https://github.com/lemmi/void-packages podman5
https://github.com/void-linux/void-packages/pull/50835

podman: update to 5.1.1.
Built on #49936.

Added dependencies on `passt` and `netavark`, since these are the new defaults. Maybe we also want to pull `aardvark-dns` in, too. `slirp4netns` and `cni` will still work, but are considered deprecated. As long as upstream doesn't make a breaking change, we should keep those dependencies to not break running systems.

@CameronNemo 

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

<!--
#### 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/50835.patch is attached

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

From f27ab33af048290f06083cd921cfe5f4da7c2c04 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
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 30537620684062fdd057cd0034c0d07ea783075a Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Fri, 14 Jun 2024 22:28:26 +0200
Subject: [PATCH 2/2] podman: update to 5.1.1.

---
 srcpkgs/podman/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index e11f13ea583d15..4741be4dbcf988 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # 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"
@@ -8,15 +8,15 @@ 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 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"
 short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cam@nohom.org>"
 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"

Re: podman: update to 5.1.1.

[lemmi]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/50835#issuecomment-2168785766

Comment:
So, just ran the checks locally and they fail with the same error. I'm not yet sure what to make of it, tbh. 

Re: podman: update to 5.1.1.

[afbjorklund]

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

New comment by afbjorklund on void-packages repository

https://github.com/void-linux/void-packages/pull/50835#issuecomment-2199403286

Comment:
For testing `podman machine`, you need to make sure that `qemu-system` is installed (during testing).

Re: [PR PATCH] [Updated] podman: update to 5.1.1.

[lemmi]

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

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

https://github.com/lemmi/void-packages podman5
https://github.com/void-linux/void-packages/pull/50835

podman: update to 5.1.1.
Built on #49936.

Added dependencies on `passt` and `netavark`, since these are the new defaults. Maybe we also want to pull `aardvark-dns` in, too. `slirp4netns` and `cni` will still work, but are considered deprecated. As long as upstream doesn't make a breaking change, we should keep those dependencies to not break running systems.

@CameronNemo 

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

<!--
#### 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/50835.patch is attached

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

From a841c44952f620642097cf8df02f26a2ff1d306a Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
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 bc1ec4d62495761b3e26e64dff52b38929111be4 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Fri, 14 Jun 2024 22:28:26 +0200
Subject: [PATCH 2/2] podman: update to 5.1.1.

---
 srcpkgs/podman/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index e11f13ea583d15..e582c2c0403fab 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # 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"
@@ -8,15 +8,16 @@ 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 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"
+checkdepends="qemu"
+depends="runc conmon cni-plugins slirp4netns fuse-overlayfs containers-common
+ containers.image containers.storage netavark passt"
 short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cam@nohom.org>"
 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"

Re: [PR PATCH] [Updated] podman: update to 5.1.1.

[lemmi]

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

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

https://github.com/lemmi/void-packages podman5
https://github.com/void-linux/void-packages/pull/50835

podman: update to 5.1.1.
Built on #49936.

Added dependencies on `passt` and `netavark`, since these are the new defaults. Maybe we also want to pull `aardvark-dns` in, too. `slirp4netns` and `cni` will still work, but are considered deprecated. As long as upstream doesn't make a breaking change, we should keep those dependencies to not break running systems.

@CameronNemo 

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

<!--
#### 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/50835.patch is attached

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

From a841c44952f620642097cf8df02f26a2ff1d306a Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
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 b510030756eda4fa0790f13185fb2d941d30cf81 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Fri, 14 Jun 2024 22:28:26 +0200
Subject: [PATCH 2/2] podman: update to 5.1.1.

---
 srcpkgs/podman/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index e11f13ea583d15..67c3ead2b138ad 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # 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"
@@ -8,15 +8,16 @@ 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 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 <cam@nohom.org>"
 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"

Re: podman: update to 5.1.1.

[lemmi]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/50835#issuecomment-2200771364

Comment:
@afbjorklund that was it, thank you.

Re: [PR PATCH] [Updated] podman: update to 5.1.1.

[lemmi]

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

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

https://github.com/lemmi/void-packages podman5
https://github.com/void-linux/void-packages/pull/50835

podman: update to 5.1.1.
Built on #49936.

Added dependencies on `passt` and `netavark`, since these are the new defaults. Maybe we also want to pull `aardvark-dns` in, too. `slirp4netns` and `cni` will still work, but are considered deprecated. As long as upstream doesn't make a breaking change, we should keep those dependencies to not break running systems.

@CameronNemo 

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

<!--
#### 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/50835.patch is attached

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

From a841c44952f620642097cf8df02f26a2ff1d306a Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
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 <lemmi@nerd2nerd.org>
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 <cam@nohom.org>"
 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"

Re: podman: update to 5.1.1.

[lemmi]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/50835#issuecomment-2228056705

Comment:
@CameronNemo ping

Re: [PR PATCH] [Updated] podman: update to 5.1.1.

[lemmi]

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

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

https://github.com/lemmi/void-packages podman5
https://github.com/void-linux/void-packages/pull/50835

podman: update to 5.1.1.
Built on #49936.

Added dependencies on `passt` and `netavark`, since these are the new defaults. Maybe we also want to pull `aardvark-dns` in, too. `slirp4netns` and `cni` will still work, but are considered deprecated. As long as upstream doesn't make a breaking change, we should keep those dependencies to not break running systems.

@CameronNemo 

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

<!--
#### 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/50835.patch is attached

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

From 794d366c8a04d3d64f14997f754a0d39421fa39e Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
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 7716aadd337a804db814bcb9dc58f12adc7fe87e Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
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 <cam@nohom.org>"
 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"

Re: podman: update to 5.1.1.

[CameronNemo]

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/50835#issuecomment-2243454466

Comment:
looks okay to me

Re: [PR PATCH] [Closed]: podman: update to 5.1.1.

[lemmi]

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

There's a closed pull request on the void-packages repository

podman: update to 5.1.1.
https://github.com/void-linux/void-packages/pull/50835

Description:
Built on #49936.

Added dependencies on `passt` and `netavark`, since these are the new defaults. Maybe we also want to pull `aardvark-dns` in, too. `slirp4netns` and `cni` will still work, but are considered deprecated. As long as upstream doesn't make a breaking change, we should keep those dependencies to not break running systems.

@CameronNemo 

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

<!--
#### 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
-->

Re: [PR PATCH] [Updated] podman: update to 5.1.1.

[lemmi]

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

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

https://github.com/lemmi/void-packages podman5
https://github.com/void-linux/void-packages/pull/50835

podman: update to 5.1.1.
Built on #49936.

Added dependencies on `passt` and `netavark`, since these are the new defaults. Maybe we also want to pull `aardvark-dns` in, too. `slirp4netns` and `cni` will still work, but are considered deprecated. As long as upstream doesn't make a breaking change, we should keep those dependencies to not break running systems.

@CameronNemo 

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

<!--
#### 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/50835.patch is attached

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