Index: sysutils/Makefile =================================================================== --- sysutils/Makefile +++ sysutils/Makefile @@ -163,6 +163,7 @@ SUBDIR += bvm SUBDIR += byobu SUBDIR += calamares + SUBDIR += catatonit SUBDIR += catfish SUBDIR += catsit SUBDIR += cbsd Index: sysutils/buildah/Makefile =================================================================== --- sysutils/buildah/Makefile +++ sysutils/buildah/Makefile @@ -1,6 +1,6 @@ PORTNAME= buildah DISTVERSIONPREFIX= v -DISTVERSION= 1.30.0 +DISTVERSION= 1.31.0 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org Index: sysutils/buildah/distinfo =================================================================== --- sysutils/buildah/distinfo +++ sysutils/buildah/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685884683 -SHA256 (containers-buildah-v1.30.0_GH0.tar.gz) = 379357ab5eacdddb0425e813631042e3de4d3f7df423ce22ad806d0aca05ccc2 -SIZE (containers-buildah-v1.30.0_GH0.tar.gz) = 15623786 +TIMESTAMP = 1689930387 +SHA256 (containers-buildah-v1.31.0_GH0.tar.gz) = c119921e8e4b2d7fd7e1041dfbcfdfac0882e3dea4f7dabdc5175f9bbc70d868 +SIZE (containers-buildah-v1.31.0_GH0.tar.gz) = 15712829 Index: sysutils/catatonit/Makefile =================================================================== --- /dev/null +++ sysutils/catatonit/Makefile @@ -0,0 +1,27 @@ +PORTNAME= catatonit +DISTVERSIONPREFIX= v +DISTVERSION= 0.1.7 +CATEGORIES= sysutils + +MAINTAINER= dfr@FreeBSD.org +COMMENT= A signal-forwarding process manager for containers +WWW= https://github.com/openSUSE/catatonit + +LICENSE= GPLv3 + +USES= autoreconf gmake +USE_GITHUB= yes +GH_ACCOUNT= dfr +GH_PROJECT= catatonit +GH_TAGNAME= 65a1a0f + +HAS_CONFIGURE= yes + +pre-configure: + @(cd ${WRKSRC} && ./autogen.sh) + +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/podman + @${RLN} ${STAGEDIR}${PREFIX}/bin/catatonit ${STAGEDIR}${PREFIX}/libexec/podman/catatonit + +.include Index: sysutils/catatonit/distinfo =================================================================== --- /dev/null +++ sysutils/catatonit/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1686565868 +SHA256 (dfr-catatonit-v0.1.7-65a1a0f_GH0.tar.gz) = e189a16b8b31a275ed9184c1c985f1cb197817b917805a99f0e576f4ec5bcfaf +SIZE (dfr-catatonit-v0.1.7-65a1a0f_GH0.tar.gz) = 22325 Index: sysutils/catatonit/pkg-descr =================================================================== --- /dev/null +++ sysutils/catatonit/pkg-descr @@ -0,0 +1,2 @@ +A container init that is so simple it's effectively brain-dead. See +https://github.com/openSUSE/catatonit#readme for more details. Index: sysutils/catatonit/pkg-plist =================================================================== --- /dev/null +++ sysutils/catatonit/pkg-plist @@ -0,0 +1,2 @@ +bin/catatonit +libexec/podman/catatonit Index: sysutils/conmon/Makefile =================================================================== --- sysutils/conmon/Makefile +++ sysutils/conmon/Makefile @@ -1,7 +1,7 @@ PORTNAME= conmon DISTVERSIONPREFIX= v DISTVERSION= 2.1.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org Index: sysutils/conmon/files/patch-src_conn__sock.c =================================================================== --- /dev/null +++ sysutils/conmon/files/patch-src_conn__sock.c @@ -0,0 +1,44 @@ +--- src/conn_sock.c.orig 2023-07-07 12:04:59 UTC ++++ src/conn_sock.c +@@ -110,6 +110,14 @@ static void bind_relative_to_dir(int dir_fd, int sock_ + if (bind(sock_fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) + pexit("Failed to bind to console-socket"); + } ++ ++static void set_socket_buffers(G_GNUC_UNUSED int fd) ++{ ++ /* ++ * Nothing needed here for Linux - the default buffer sizes for unix domain sockets are large enough. ++ */ ++} ++ + #endif + + #ifdef __FreeBSD__ +@@ -135,6 +143,18 @@ static void bind_relative_to_dir(int dir_fd, int sock_ + if (fchmodat(dir_fd, addr.sun_path, 0700, AT_SYMLINK_NOFOLLOW)) + pexit("Failed to change console-socket permissions"); + } ++ ++static void set_socket_buffers(int fd) ++{ ++ int sz = CONN_SOCK_BUF_SIZE; ++ if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz))) { ++ nwarn("failed to set socket receive buffer size"); ++ } ++ if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sz, sizeof(sz))) { ++ nwarn("failed to set socket send buffer size"); ++ } ++} ++ + #endif + + static char *setup_socket(int *fd, const char *path) +@@ -357,6 +377,7 @@ static gboolean attach_cb(int fd, G_GNUC_UNUSED GIOCon + nwarn("Failed to accept client connection on attach socket"); + } else { + struct remote_sock_s *remote_sock; ++ set_socket_buffers(new_fd); + if (srcsock->dest->readers == NULL) { + srcsock->dest->readers = g_ptr_array_new_with_free_func(free); + } Index: sysutils/containers-common/Makefile =================================================================== --- sysutils/containers-common/Makefile +++ sysutils/containers-common/Makefile @@ -1,6 +1,6 @@ PORTNAME= containers-common DISTVERSIONPREFIX= v -DISTVERSION= 0.50.1 +DISTVERSION= 0.53.0 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -24,9 +24,9 @@ NO_ARCH= yes -IMAGEVERSION= 5.22.1 -STORAGEVERSION= 1.43.0 -SKOPEOVERSION= 1.10.0 +IMAGEVERSION= 5.25.0 +STORAGEVERSION= 1.47.0 +SKOPEOVERSION= 1.12.0 WRKSRC= ${WRKDIR}/common-${DISTVERSION} IMAGESRC= ${WRKDIR}/image-${IMAGEVERSION} Index: sysutils/containers-common/distinfo =================================================================== --- sysutils/containers-common/distinfo +++ sysutils/containers-common/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1666442335 -SHA256 (containers-common-v0.50.1_GH0.tar.gz) = 35d5c1d2a1e5d51bd75e017b06b5a3bf54b1a8d44029eedf489df04dab394efa -SIZE (containers-common-v0.50.1_GH0.tar.gz) = 8579517 -SHA256 (containers-image-v5.22.1_GH0.tar.gz) = f76780cb2d3389805d56ea9162482e291de527a4f628624016eb7b0f9e06c750 -SIZE (containers-image-v5.22.1_GH0.tar.gz) = 645125 -SHA256 (containers-storage-v1.43.0_GH0.tar.gz) = 472d0190106573db5f9b97ed1f60f96f06ed8534d3b30f86ef98556f0a462c29 -SIZE (containers-storage-v1.43.0_GH0.tar.gz) = 3773804 -SHA256 (containers-skopeo-v1.10.0_GH0.tar.gz) = c3d15ec25c028980b795a0ccdcd48296287b8467fe24a7bc319f5fc87378fe8c -SIZE (containers-skopeo-v1.10.0_GH0.tar.gz) = 6460856 +TIMESTAMP = 1687851338 +SHA256 (containers-common-v0.53.0_GH0.tar.gz) = 1c60eace075c40743fa752281f6e85ee8b5a0659525ccd6dab8675e8ae9ac9a0 +SIZE (containers-common-v0.53.0_GH0.tar.gz) = 9913486 +SHA256 (containers-image-v5.25.0_GH0.tar.gz) = 67a118ab12ec1001ad3672a4ac2a61ffe2be764b867e027e595e00df69d7eb19 +SIZE (containers-image-v5.25.0_GH0.tar.gz) = 691309 +SHA256 (containers-storage-v1.47.0_GH0.tar.gz) = 3ec92961e0e4eb3916285121781308beebdbca20f2f90b1ce84bcda5caa10bd1 +SIZE (containers-storage-v1.47.0_GH0.tar.gz) = 4090714 +SHA256 (containers-skopeo-v1.12.0_GH0.tar.gz) = f7bbb3748eeb0c29abf5bfe9b1c1a149464c4ea65705e25686df3b9bcbd7bb89 +SIZE (containers-skopeo-v1.12.0_GH0.tar.gz) = 8216468 Index: sysutils/containers-common/pkg-plist =================================================================== --- sysutils/containers-common/pkg-plist +++ sysutils/containers-common/pkg-plist @@ -13,6 +13,7 @@ share/man/man5/containers-registries.conf.d.5.gz share/man/man5/containers-registries.d.5.gz share/man/man5/containers-signature.5.gz +share/man/man5/containers-sigstore-signing-params.yaml.5.gz share/man/man5/containers-storage.conf.5.gz share/man/man5/containers-transports.5.gz share/man/man5/containers.conf.5.gz Index: sysutils/ocijail/Makefile =================================================================== --- sysutils/ocijail/Makefile +++ sysutils/ocijail/Makefile @@ -1,5 +1,6 @@ PORTNAME= ocijail -PORTVERSION= 0.1 +DISTVERSIONPREFIX= v +PORTVERSION= 0.1.1 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -14,7 +15,6 @@ USE_GITHUB= yes GH_ACCOUNT= dfr -GH_TAGNAME= v0.1 PLIST_FILES= bin/ocijail Index: sysutils/ocijail/distinfo =================================================================== --- sysutils/ocijail/distinfo +++ sysutils/ocijail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685884172 -SHA256 (dfr-ocijail-0.1-v0.1_GH0.tar.gz) = 68081bc534efe504a090f0a06238340ef5f1ecd823592878192b4eef69b02147 -SIZE (dfr-ocijail-0.1-v0.1_GH0.tar.gz) = 48053228 +TIMESTAMP = 1688807568 +SHA256 (dfr-ocijail-v0.1.1_GH0.tar.gz) = 439e0506b2c018205a5361efc37a3409336b3d0da5cdef07443838119ea03054 +SIZE (dfr-ocijail-v0.1.1_GH0.tar.gz) = 48053565 Index: sysutils/podman-suite/Makefile =================================================================== --- sysutils/podman-suite/Makefile +++ sysutils/podman-suite/Makefile @@ -1,5 +1,5 @@ PORTNAME= podman-suite -PORTVERSION= 20230605 +PORTVERSION= 20230721 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org Index: sysutils/podman/Makefile =================================================================== --- sysutils/podman/Makefile +++ sysutils/podman/Makefile @@ -1,6 +1,6 @@ PORTNAME= podman DISTVERSIONPREFIX= v -DISTVERSION= 4.5.1 +DISTVERSION= 4.6.0 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -19,7 +19,7 @@ ocijail:sysutils/ocijail USES= gmake go:no_targets pkgconfig python:build shebangfix -USE_RC_SUBR= podman +USE_RC_SUBR= podman podman_service SHEBANG_FILES= ${WRKSRC}/hack/markdown-preprocess MAKE_ARGS= SHELL=${LOCALBASE}/bin/bash Index: sysutils/podman/distinfo =================================================================== --- sysutils/podman/distinfo +++ sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685884846 -SHA256 (containers-podman-v4.5.1_GH0.tar.gz) = ee2c8b02b7fe301057f0382637b995a9c6c74e8d530692d6918e4c509ade6e39 -SIZE (containers-podman-v4.5.1_GH0.tar.gz) = 17425208 +TIMESTAMP = 1689924226 +SHA256 (containers-podman-v4.6.0_GH0.tar.gz) = a1b4fd7c3a9b850ab4b405f8d03115248a780c89b11e7d8ffbba2d1f668f678e +SIZE (containers-podman-v4.6.0_GH0.tar.gz) = 17458408 Index: sysutils/podman/files/podman.in =================================================================== --- sysutils/podman/files/podman.in +++ sysutils/podman/files/podman.in @@ -26,16 +26,24 @@ stop_cmd="podman_stop" restart_cmd="podman_stop && podman_start" +# Turn newlines into spaces to avoid line breaks in log messages +container_list=$( + ${podman} container ls --all --filter restart-policy=always -q \ + | tr '\n' ' ') + podman_start() { - ${podman} ${podman_flags} start --all --filter restart-policy=always + if [ -n "${container_list}" ]; then + startmsg "Starting podman containers: ${container_list}" + ${podman} ${podman_flags} start ${container_list} + fi } podman_stop() { - list=$(${podman} container ls --filter restart-policy=always -q) - if [ -n "${list}" ]; then - ${podman} ${podman_flags} stop ${list} + if [ -n "${container_list}" ]; then + echo "Stopping podman containers: ${container_list}" + ${podman} ${podman_flags} stop ${container_list} fi } Index: sysutils/podman/files/podman_service.in =================================================================== --- /dev/null +++ sysutils/podman/files/podman_service.in @@ -0,0 +1,37 @@ +#!/bin/sh + +# Podman API Service + +# PROVIDE: podman_service +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# Add the following to /etc/rc.conf[.local] to enable this service +# +# podman_service_enable: Set to NO by default. +# Set it to YES to start podman API service daemon +# podman_service_flags: Extra flags for podman command (e.g. to set logging level) +# podman_service_log: Path to log file for podman stderr output +# + +. /etc/rc.subr + +name=podman_service +rcvar=${name}_enable + +: ${podman_service_enable:=NO} +: ${podman_service_flags:="--time=0"} +: ${podman_service_log:="/var/log/podman.log"} + +command="%%PREFIX%%/bin/podman" +pidfile="/var/run/$name.pid" +start_cmd="podman_start" + +podman_start() +{ + startmsg "Starting ${name}." + /usr/sbin/daemon -o ${podman_service_log} -f -p ${pidfile} ${command} system service ${podman_service_flags} +} + +load_rc_config ${name} +run_rc_command "$1" Index: sysutils/podman/pkg-plist =================================================================== --- sysutils/podman/pkg-plist +++ sysutils/podman/pkg-plist @@ -1,4 +1,5 @@ bin/podman +bin/podmansh bin/podman-remote @dir libexec/podman share/bash-completion/completions/podman @@ -214,6 +215,7 @@ share/man/man1/podman-volume.1.gz share/man/man1/podman-wait.1.gz share/man/man1/podman.1.gz +share/man/man1/podmansh.1.gz share/man/man5/quadlet.5.gz share/man/man5/podman-systemd.unit.5.gz share/zsh/site-functions/_podman Index: sysutils/skopeo/Makefile =================================================================== --- sysutils/skopeo/Makefile +++ sysutils/skopeo/Makefile @@ -1,6 +1,6 @@ PORTNAME= skopeo DISTVERSIONPREFIX= v -DISTVERSION= 1.12.0 +DISTVERSION= 1.13.0 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org Index: sysutils/skopeo/distinfo =================================================================== --- sysutils/skopeo/distinfo +++ sysutils/skopeo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685884558 -SHA256 (containers-skopeo-v1.12.0_GH0.tar.gz) = f7bbb3748eeb0c29abf5bfe9b1c1a149464c4ea65705e25686df3b9bcbd7bb89 -SIZE (containers-skopeo-v1.12.0_GH0.tar.gz) = 8216468 +TIMESTAMP = 1689930441 +SHA256 (containers-skopeo-v1.13.0_GH0.tar.gz) = 65c90d5ba55a5075e56f9a4a5d96a46ca4c443f4cd2701c2eabb9592ba3460ce +SIZE (containers-skopeo-v1.13.0_GH0.tar.gz) = 7923885