Index: net/containernetworking-plugins/Makefile =================================================================== --- net/containernetworking-plugins/Makefile +++ net/containernetworking-plugins/Makefile @@ -1,6 +1,5 @@ PORTNAME= containernetworking-plugins -DISTVERSION= 0.2.1 -PORTREVISION= 7 +DISTVERSION= 0.3 CATEGORIES= net MAINTAINER= dfr@FreeBSD.org @@ -15,7 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= dfr GH_PROJECT= plugins -GH_TAGNAME= freebsd-v0.2.1 +GH_TAGNAME= freebsd-v0.3 GH_TUPLE= golang:sys:v0.6.0:sys pre-patch: Index: net/containernetworking-plugins/distinfo =================================================================== --- net/containernetworking-plugins/distinfo +++ net/containernetworking-plugins/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1679673922 -SHA256 (dfr-plugins-0.2.1-freebsd-v0.2.1_GH0.tar.gz) = b915e4861e311797ab266badca84977a9daf1618c7b08c694f1402fbaa7ece66 -SIZE (dfr-plugins-0.2.1-freebsd-v0.2.1_GH0.tar.gz) = 4197418 +TIMESTAMP = 1685956902 +SHA256 (dfr-plugins-0.3-freebsd-v0.3_GH0.tar.gz) = 80d80ad6400a19799a99caa6bf50ca162d79f6c4ca7957b84c8500a43791eef4 +SIZE (dfr-plugins-0.3-freebsd-v0.3_GH0.tar.gz) = 4198199 SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234 Index: sysutils/buildah/Makefile =================================================================== --- sysutils/buildah/Makefile +++ sysutils/buildah/Makefile @@ -1,7 +1,6 @@ PORTNAME= buildah DISTVERSIONPREFIX= v -DISTVERSION= 1.29.1 -PORTREVISION= 1 +DISTVERSION= 1.30.0 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org Index: sysutils/buildah/distinfo =================================================================== --- sysutils/buildah/distinfo +++ sysutils/buildah/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676644594 -SHA256 (containers-buildah-v1.29.1_GH0.tar.gz) = ac20cdbd81616f3f03ef42dc3139de118e3b6d0ed737c994c45dc1039e0fa1c1 -SIZE (containers-buildah-v1.29.1_GH0.tar.gz) = 15594930 +TIMESTAMP = 1685884683 +SHA256 (containers-buildah-v1.30.0_GH0.tar.gz) = 379357ab5eacdddb0425e813631042e3de4d3f7df423ce22ad806d0aca05ccc2 +SIZE (containers-buildah-v1.30.0_GH0.tar.gz) = 15623786 Index: sysutils/buildah/pkg-plist =================================================================== --- sysutils/buildah/pkg-plist +++ sysutils/buildah/pkg-plist @@ -23,6 +23,7 @@ share/man/man1/buildah-manifest-rm.1.gz share/man/man1/buildah-manifest.1.gz share/man/man1/buildah-mount.1.gz +share/man/man1/buildah-prune.1.gz share/man/man1/buildah-pull.1.gz share/man/man1/buildah-push.1.gz share/man/man1/buildah-rename.1.gz Index: sysutils/conmon/Makefile =================================================================== --- sysutils/conmon/Makefile +++ sysutils/conmon/Makefile @@ -1,7 +1,7 @@ PORTNAME= conmon DISTVERSIONPREFIX= v DISTVERSION= 2.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org Index: sysutils/conmon/files/patch-src_close__fds.c =================================================================== --- /dev/null +++ sysutils/conmon/files/patch-src_close__fds.c @@ -0,0 +1,33 @@ +--- src/close_fds.c.orig 2023-02-28 02:39:11 UTC ++++ src/close_fds.c +@@ -22,6 +22,12 @@ + + #include + ++#ifdef __FreeBSD__ ++#define OPEN_FILES_DIR "/dev/fd" ++#else ++#define OPEN_FILES_DIR "/proc/self/fd" ++#endif ++ + static int open_files_max_fd; + static fd_set *open_files_set; + +@@ -31,7 +37,7 @@ static void __attribute__((constructor)) init() + ssize_t size = 0; + DIR *d; + +- d = opendir("/proc/self/fd"); ++ d = opendir(OPEN_FILES_DIR); + if (!d) + return; + +@@ -85,7 +91,7 @@ void close_all_fds_ge_than(int firstfd) + struct dirent *ent; + DIR *d; + +- d = opendir("/proc/self/fd"); ++ d = opendir(OPEN_FILES_DIR); + if (!d) + return; + Index: sysutils/conmon/pkg-message =================================================================== --- /dev/null +++ sysutils/conmon/pkg-message @@ -0,0 +1,17 @@ +[ +{ type: install + message: < Index: sysutils/podman/distinfo =================================================================== --- sysutils/podman/distinfo +++ sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678027489 -SHA256 (containers-podman-v4.4.2_GH0.tar.gz) = 59cec158438efa8a3e651b19e150d9afd90f7e3f07c30605a997e18b8c54b67c -SIZE (containers-podman-v4.4.2_GH0.tar.gz) = 14401422 +TIMESTAMP = 1685884846 +SHA256 (containers-podman-v4.5.1_GH0.tar.gz) = ee2c8b02b7fe301057f0382637b995a9c6c74e8d530692d6918e4c509ade6e39 +SIZE (containers-podman-v4.5.1_GH0.tar.gz) = 17425208 Index: sysutils/podman/files/patch-libpod_container__api.go =================================================================== --- sysutils/podman/files/patch-libpod_container__api.go +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 { Index: sysutils/podman/files/podman.in =================================================================== --- /dev/null +++ sysutils/podman/files/podman.in @@ -0,0 +1,43 @@ +#!/bin/sh + +# Podman startup script - start all containers with restart policy set to always. + +# PROVIDE: podman +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# Add the following to /etc/rc.conf[.local] to enable this service +# +# podman_enable: Set to NO by default. +# Set it to YES to restart containers after restart +# podman_flags: Extra flags for podman command (e.g. to set logging level) +# + +. /etc/rc.subr + +name=podman +rcvar=${name}_enable + +: ${podman_enable:=NO} +: ${podman_flags:="--noout"} + +podman=%%PREFIX%%/bin/${name} +start_cmd="podman_start" +stop_cmd="podman_stop" +restart_cmd="podman_stop && podman_start" + +podman_start() +{ + ${podman} ${podman_flags} start --all --filter restart-policy=always +} + +podman_stop() +{ + list=$(${podman} container ls --filter restart-policy=always -q) + if [ -n "${list}" ]; then + ${podman} ${podman_flags} stop ${list} + fi +} + +load_rc_config ${name} +run_rc_command "$1" Index: sysutils/podman/pkg-message =================================================================== --- sysutils/podman/pkg-message +++ sysutils/podman/pkg-message @@ -2,3 +2,11 @@ used for evaluation and testing purposes only. $ sudo podman run --rm docker.io/dougrabson/hello + +podman can restart containers after a host is rebooted. To enable this, use: + +$ sudo sysrc podman_enable=YES + +and start the container with a restart policy: + +$ sudo podman run -d --restart=always myimage Index: sysutils/podman/pkg-plist =================================================================== --- sysutils/podman/pkg-plist +++ sysutils/podman/pkg-plist @@ -107,6 +107,8 @@ share/man/man1/podman-machine-inspect.1.gz share/man/man1/podman-machine-list.1.gz share/man/man1/podman-machine-ls.1.gz +share/man/man1/podman-machine-os-apply.1.gz +share/man/man1/podman-machine-os.1.gz share/man/man1/podman-machine-rm.1.gz share/man/man1/podman-machine-set.1.gz share/man/man1/podman-machine-ssh.1.gz @@ -132,6 +134,7 @@ share/man/man1/podman-network-prune.1.gz share/man/man1/podman-network-reload.1.gz share/man/man1/podman-network-rm.1.gz +share/man/man1/podman-network-update.1.gz share/man/man1/podman-network.1.gz share/man/man1/podman-pause.1.gz share/man/man1/podman-play-kube.1.gz @@ -165,6 +168,7 @@ share/man/man1/podman-save.1.gz share/man/man1/podman-search.1.gz share/man/man1/podman-secret-create.1.gz +share/man/man1/podman-secret-exists.1.gz share/man/man1/podman-secret-inspect.1.gz share/man/man1/podman-secret-ls.1.gz share/man/man1/podman-secret-rm.1.gz @@ -210,5 +214,7 @@ share/man/man1/podman-volume.1.gz share/man/man1/podman-wait.1.gz share/man/man1/podman.1.gz +share/man/man5/quadlet.5.gz +share/man/man5/podman-systemd.unit.5.gz share/zsh/site-functions/_podman share/zsh/site-functions/_podman-remote Index: sysutils/skopeo/Makefile =================================================================== --- sysutils/skopeo/Makefile +++ sysutils/skopeo/Makefile @@ -1,7 +1,6 @@ PORTNAME= skopeo DISTVERSIONPREFIX= v -DISTVERSION= 1.11.1 -PORTREVISION= 1 +DISTVERSION= 1.12.0 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org Index: sysutils/skopeo/distinfo =================================================================== --- sysutils/skopeo/distinfo +++ sysutils/skopeo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676644409 -SHA256 (containers-skopeo-v1.11.1_GH0.tar.gz) = 7e2b327a687d2230e9075120fff1024e6c2f22738a4179030121c953dda7d3b5 -SIZE (containers-skopeo-v1.11.1_GH0.tar.gz) = 8071084 +TIMESTAMP = 1685884558 +SHA256 (containers-skopeo-v1.12.0_GH0.tar.gz) = f7bbb3748eeb0c29abf5bfe9b1c1a149464c4ea65705e25686df3b9bcbd7bb89 +SIZE (containers-skopeo-v1.12.0_GH0.tar.gz) = 8216468