From nobody Mon Feb 23 11:40:02 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fKJmy5Tl9z6TBvt for ; Mon, 23 Feb 2026 11:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKJmy3fhSz4H0X for ; Mon, 23 Feb 2026 11:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771846802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q3Hqf15X/h/7ZU5SL8VLdxx/pYw7LTFiQPeU0mrCc6M=; b=Z6nCmBFXLDIzPJMtfAZ+r5UMQvNny+q3dD+gTppxbSToZlWmbJJTcZiTK5z3/TxU/eq7dL Znwgb/UNG/mlZ5uwFY7iPkPtx363hLM7TkMYhFpLW6/tccKyYHerNXLzId5jI8Ji+Y2Vle r/Zfh6WlT9uQPQbQKoeBACOmbkOPEInN/t/HkYyaWmhbgVOQ35qBpWQ09hiYsdkSokJhc2 WME8Yl2yHMKkFzdmRYMv+LtzO9jQzqi/7b002IeX84cs5vUaasfzHcWIst7bB3bj8hRDrC hhA2lOyTOM1ZLBHi4ecxQPMbz82IAY2gIi3QPY2AqMlILi5RU3QDcjP3f74eVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771846802; a=rsa-sha256; cv=none; b=FDBfV9tpUVJ+mBNF5ZEFNzalfZH8h4FVHacff8F58ptTRScA3QfauiR/ydAeu35oYPSuEF ZE5k52tRTpapmrKRwY9PjsWSYYhq2qTZg2oMFFBeUDV9dPCoO6AdijeCX66vGeoj8/cKct o/16bYNskqDyB60eWZBm5X7G5l9laX1v17zcKnzIUPZe/zfCN2kMpu+x6gagO9jt/xoOMX G9b6GCLIQ6ROblxugIfN5sWMtwsAHXL2j/Ngtv7nShAPJ75CLs89oga/7FSefyLdvphbuH CiUhOJn9pOLWchkfnYEgQGNOtXyJzm0YiTqp76U3vBXzNKVn+sF+/9KaYunGaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771846802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q3Hqf15X/h/7ZU5SL8VLdxx/pYw7LTFiQPeU0mrCc6M=; b=nyeilxrgHp+ee22pgv/Id39XvnthiggW4i7NxOAduTNW5V9uHp+ooTXvzbQwhk0Pt9EY82 gzpe9eAofSA1VXSbn5CpA8Rc46I7W2jxsTNx4T9OlmSRY69A22FOJoAMPdbljGygDpve5U F9J3lkRqbXekBbEVv6zbziZLthiE8u9P4qxGU++GxpnKYO3E4q+d9pj9ADjVsWrx1yZfKi J7lcN5otsuiygSw3fo/vCC3rCO1mrWDAAw+YcGA4La3Ingx2f8oDE3XCoXSuNJiK9nIWK7 b+vARx9gnbRXYJQ0acvPlEvVSunZBE16vZ+Risv0hk/U5kwYW2cDvEBISty1Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKJmy3GPmzChy for ; Mon, 23 Feb 2026 11:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bfcd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 11:40:02 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 0882ac8e21b3 - main - sysutils/podman: Revert "Allow setting ownership on auto-created socket" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0882ac8e21b366f5434850fda619b393080d7210 Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 11:40:02 +0000 Message-Id: <699c3c92.3bfcd.7b94286a@gitrepo.freebsd.org> The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=0882ac8e21b366f5434850fda619b393080d7210 commit 0882ac8e21b366f5434850fda619b393080d7210 Author: Dave Cottlehuber AuthorDate: 2026-02-23 11:38:16 +0000 Commit: Dave Cottlehuber CommitDate: 2026-02-23 11:39:46 +0000 sysutils/podman: Revert "Allow setting ownership on auto-created socket" This works functionally, but is being managed by the incorrect daemon. Podman alone simply ensures auto-start of containers; podman_service provides the API. This will be corrected in an upcoming commit. This reverts commit 2c53428ae117108d41eb4e19935ed98b478f4f7f. --- sysutils/podman/Makefile | 2 +- sysutils/podman/files/podman.in | 32 -------------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index 8d09cfe3fec0..49a8101c3618 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,7 +1,7 @@ PORTNAME= podman DISTVERSIONPREFIX= v DISTVERSION= 5.7.1 -PORTREVISION= 4 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/podman/files/podman.in b/sysutils/podman/files/podman.in index 13aa7b8ec94d..653f7cd25507 100755 --- a/sysutils/podman/files/podman.in +++ b/sysutils/podman/files/podman.in @@ -20,17 +20,9 @@ rcvar=${name}_enable : ${podman_enable:=NO} : ${podman_flags:="--noout"} -: ${podman_user:="www"} -: ${podman_group:="www"} -: ${podman_mode:="0770"} -: ${podman_rundir:="/var/run/podman"} -: ${podman_socket:="${podman_rundir}/podman.sock"} -: ${podman_socket_timeout:=5} podman=%%PREFIX%%/bin/${name} -start_precmd="podman_prestart" start_cmd="podman_start" -start_postcmd="podman_poststart" stop_cmd="podman_stop" restart_cmd="podman_stop && podman_start" @@ -39,30 +31,6 @@ container_list=$( ${podman} container ls --all --filter restart-policy=always -q \ | tr '\n' ' ') -podman_prestart() -{ - install -d -o ${podman_user} -g ${podman_group} -m ${podman_mode} ${podman_rundir} -} - -podman_poststart() -{ - local _timeout=${podman_socket_timeout} - local _elapsed=0 - - while [ ${_elapsed} -lt ${_timeout} ]; do - if [ -S "${podman_socket}" ]; then - chown ${podman_user}:${podman_group} "${podman_socket}" - chmod ${podman_mode} "${podman_socket}" - return 0 - fi - sleep 1 - _elapsed=$((_elapsed + 1)) - done - - warn "Timed out waiting for ${podman_socket} after ${_timeout} seconds" - return 1 -} - podman_start() { if [ -n "${container_list}" ]; then