Page MenuHomeFreeBSD

sysutils/podman-suite: update to 20250203
AbandonedPublic

Authored by dfr on Feb 6 2025, 12:06 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 4, 3:04 AM
Unknown Object (File)
Sun, Mar 2, 1:49 AM
Unknown Object (File)
Feb 18 2025, 6:15 PM
Unknown Object (File)
Feb 17 2025, 3:56 AM
Unknown Object (File)
Feb 13 2025, 11:06 PM
Unknown Object (File)
Feb 13 2025, 1:15 AM
Restricted File
Feb 6 2025, 3:56 PM
Restricted File
Feb 6 2025, 3:55 PM
Subscribers
None

Details

Reviewers
dch
osa
Summary

This also adds catatonit as a run-time dependancy since it is needed to
support 'podman pod'.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 62282
Build 59166: arc lint + arc unit

Event Timeline

dfr requested review of this revision.Feb 6 2025, 12:06 PM
dfr created this revision.

The patch introduces new dependency - sysutils/catatonit; the current version in the ports tree is 0.1.7, latest one is 0.2.1. Is there any plans to update the port to the recent version?

Also, RUN_DEPENDS list will look better when it sorted out, i.e.:

RUN_DEPENDS=    buildah>=0:sysutils/buildah \
                catatonit>=0:sysutils/catatonit \
                podman>=0:sysutils/podman \
                skopeo>=0:sysutils/skopeo

There're two spaces after buildah work in RUN_DEPENDS section, one of those can be safely removed.

This comment was removed by osa.

Here's the patch{F109555392}

Here's the patch{F109555392}

In D48869#1114547, @osa wrote:

The patch introduces new dependency - sysutils/catatonit; the current version in the ports tree is 0.1.7, latest one is 0.2.1. Is there any plans to update the port to the recent version?

I've taken a look on the version 0.2.1 of the catatonit. Your patches in the freebsd branch look good, however there's a small change in the distribution:

--- catatonit.c
+++ catatonit.c
-#ifdef HAVE_CLOSE_RANGE
+#ifdef HAVE_LINUX_CLOSE_RANGE_H

So, I've applied both of your patches, fix the rejection and built new version. Hope that can be updated as well.

Combined your patches into one here.

In D48869#1114547, @osa wrote:

The patch introduces new dependency - sysutils/catatonit; the current version in the ports tree is 0.1.7, latest one is 0.2.1. Is there any plans to update the port to the recent version?

I'm currently building this from my fork of catatonit - the upstream seemed dormant when I did the port. Since then, there clearly has been some activity upstream so I will update my fork and look into the possibility of getting the FreeBSD support upstream. Looking at the changes between 0.1.7 and 0.2.1, I don't think there is a problem staying with 0.1.7 for now though.

In D48869#1114602, @osa wrote:

Here's the patch{F109555392}

In D48869#1114547, @osa wrote:

The patch introduces new dependency - sysutils/catatonit; the current version in the ports tree is 0.1.7, latest one is 0.2.1. Is there any plans to update the port to the recent version?

I've taken a look on the version 0.2.1 of the catatonit. Your patches in the freebsd branch look good, however there's a small change in the distribution:

--- catatonit.c
+++ catatonit.c
-#ifdef HAVE_CLOSE_RANGE
+#ifdef HAVE_LINUX_CLOSE_RANGE_H

So, I've applied both of your patches, fix the rejection and built new version. Hope that can be updated as well.

Combined your patches into one here.

Thanks for this - I will incorporate this into my fork and make a new review for catatonit.

After further testing, I came across a regression in 'podman build' and 'buildah build' which I will get fixed upstream (https://github.com/containers/common/pull/2326). I will add that as patches to the buildah and podman ports and test a bit more before I ship this.

Committed without remembering to add 'Differential Revision'