diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index cc4098f7f499..82877ad1e1c2 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,42 +1,41 @@ PORTNAME= podman -PORTVERSION= 4.4.0.dev -PORTREVISION= 6 +DISTVERSIONPREFIX= v +DISTVERSION= 4.4.2 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org COMMENT= Manage Pods, Containers and Container Images WWW= https://podman.io/ LICENSE= GPLv2 BUILD_DEPENDS= bash:shells/bash \ go-md2man:textproc/go-md2man \ gsed:textproc/gsed LIB_DEPENDS= libgpgme.so:security/gpgme RUN_DEPENDS= conmon:sysutils/conmon \ containernetworking-plugins>=0:net/containernetworking-plugins \ containers-common>=0:sysutils/containers-common \ ocijail:sysutils/ocijail USES= gmake go:no_targets pkgconfig python:3.7+,build shebangfix SHEBANG_FILES= ${WRKSRC}/hack/markdown-preprocess # Parallel builds are flaky due to some kind of file race in the # markdown-preprocess phase of the docs build. MAKE_JOBS_UNSAFE= yes USE_GITHUB= yes GH_ACCOUNT= containers GH_PROJECT= podman -GH_TAGNAME= b294b7c3 INSTALL_TARGET= install install.completions # Temporary until https://github.com/containers/podman/pull/16422 lands do-install: ${GMAKE} -C ${WRKSRC} DESTDIR=${STAGEDIR} GO=${GO_CMD} install ${GMAKE} -C ${WRKSRC} DESTDIR=${STAGEDIR} GO=${GO_CMD} install.completions ${RM} ${STAGEDIR}${PREFIX}/lib/tmpfiles.d/podman.conf .include diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo index e4e0d4997ff5..3fb40bc89c3d 100644 --- a/sysutils/podman/distinfo +++ b/sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669815845 -SHA256 (containers-podman-4.4.0.dev-b294b7c3_GH0.tar.gz) = 359c711ae275f432e4648d63944effa1779ff333828a4f7f46066081911e6232 -SIZE (containers-podman-4.4.0.dev-b294b7c3_GH0.tar.gz) = 13077012 +TIMESTAMP = 1678027489 +SHA256 (containers-podman-v4.4.2_GH0.tar.gz) = 59cec158438efa8a3e651b19e150d9afd90f7e3f07c30605a997e18b8c54b67c +SIZE (containers-podman-v4.4.2_GH0.tar.gz) = 14401422 diff --git a/sysutils/podman/files/patch-libpod_container__api.go b/sysutils/podman/files/patch-libpod_container__api.go new file mode 100644 index 000000000000..b6573d8a5467 --- /dev/null +++ b/sysutils/podman/files/patch-libpod_container__api.go @@ -0,0 +1,19 @@ +--- libpod/container_api.go.orig 2023-02-23 15:59:21 UTC ++++ libpod/container_api.go +@@ -788,10 +788,12 @@ func (c *Container) Cleanup(ctx context.Context) error + + // make sure all the container processes are terminated if we are running without a pid namespace. + hasPidNs := false +- for _, i := range c.config.Spec.Linux.Namespaces { +- if i.Type == spec.PIDNamespace { +- hasPidNs = true +- break ++ if c.config.Spec.Linux != nil { ++ for _, i := range c.config.Spec.Linux.Namespaces { ++ if i.Type == spec.PIDNamespace { ++ hasPidNs = true ++ break ++ } + } + } + if !hasPidNs { diff --git a/sysutils/podman/pkg-message b/sysutils/podman/pkg-message index 6b311a50f0a1..30efe34d4a9c 100644 --- a/sysutils/podman/pkg-message +++ b/sysutils/podman/pkg-message @@ -1,4 +1,4 @@ -This port of the podman container engine is based on unreleased -sources and should be used for evaluation and testing purposes only. +The FreeBSD port of the podman container engine is experimental and should be +used for evaluation and testing purposes only. $ sudo podman run --rm docker.io/dougrabson/hello