From nobody Sat Jul 22 12:38:06 2023 X-Original-To: dev-commits-ports-all@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 4R7Qv25FMlz4nxWR; Sat, 22 Jul 2023 12:38:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R7Qv24dxVz4Nk3; Sat, 22 Jul 2023 12:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690029486; 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=PeckZSYDRqOzVMZMYctninA2pMqW0TJtc1WPBZ94mQQ=; b=YW4FEp0X8JNlpvpJcJP/CjP2mwZrq2LmwzqJu+t4DpDV0KrwxWiMKT1/leOyPec5N12Q2r vVKkf35LTXMOEwwQqrLhqXoWULD6yvosMJJkMrdYN29lO49shHBtKYZtjCvmARSj1HKq21 s7amOoDegA+GDLCudeaySAdq+WsQfGvQ+wqK2EoS8q/w8Zqp3acFktniQQOqkwTsAr/lEX xvW63LfAgIsnTFzLd5aHR/vloeMPRJfcJ8710+9HEmPW2NuLxBlg+eNTmtXhcByorfAKsN hmUASfIDqD3uttdd+EEVdfnQ6CVRwHYaMwNRrkIOs7SxNWvwWmbZcQn8y9dgDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690029486; 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=PeckZSYDRqOzVMZMYctninA2pMqW0TJtc1WPBZ94mQQ=; b=raGNXHhBHfD44r6CoIlTfs94l8OTgCV8jjZHp2yLMzteS0sT3kPRg2ai7HFtmN1V0eMa0k yh3aq73k6tpKVPL4t5LvfJ1Z3UfEJOzgl7wM1fjW1D+eBAS1pHjDpJRLEX0KSFJe91LgUZ +VibdcHxs69Jabl6DllDppRYReZls6ULNncsxWFtO/oeIrprMR3K+DfVy/McJanqOslmKY i+ugHxrvepOMRECQX1l2rfbCygynaro5kaA1FWK3HhDFfvdkMmum2g2Bx4zqtRRXfB0Kxc An3sUT+MOvEHzG8qPpINRdRng8gEjakjoJ2I1n2lWdRmNJp1i2p1tvfdlOc9UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690029486; a=rsa-sha256; cv=none; b=h/IUJuiZ5K3A93ZnxbcaKrpnMX4FhLr3ozMpJJlnxjJb6lK3XDP1C7gNPDpfDYTHFN322j QbnvscFdl3EZ/yVIYA+gQOMKEmlwRVLB/kV1u1lRpRVi/zyii7FV4XqSFX1dH5a/IiRSD/ neJdw2tCcFEnVKeU/vdGmGIKseyELLxHqiVWb03UWQsuiPbAF1Ax6ENOfkBsgv4cfD7GvP +wwT/4S3VefP4gPytnfchmDbqbAEAugMdkfrGIxwLhxPCqmLlSal1DlWXU1o3ITR0uK3pI NGpPCPykFcVrXyLraCvlBzyCv+vY8j3GvqBIzTTsWhPkBL7xGJobRoyLMLJZzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R7Qv230srzvf7; Sat, 22 Jul 2023 12:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36MCc6wX097320; Sat, 22 Jul 2023 12:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36MCc6qZ097319; Sat, 22 Jul 2023 12:38:06 GMT (envelope-from git) Date: Sat, 22 Jul 2023 12:38:06 GMT Message-Id: <202307221238.36MCc6qZ097319@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Doug Rabson Subject: git: b6ee66a16fcb - main - sysutils/podman: update to 4.6.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6ee66a16fcb57e0dc9dfccf86ce40ee3ab7ba18 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6ee66a16fcb57e0dc9dfccf86ce40ee3ab7ba18 commit b6ee66a16fcb57e0dc9dfccf86ce40ee3ab7ba18 Author: Doug Rabson AuthorDate: 2023-07-07 12:18:19 +0000 Commit: Doug Rabson CommitDate: 2023-07-22 12:36:47 +0000 sysutils/podman: update to 4.6.0 Approved by: lwhsu --- sysutils/podman/Makefile | 4 +-- sysutils/podman/distinfo | 6 ++-- ...thub.com_containers_common_pkg_config_config.go | 11 +++++++ ...hub.com_containers_common_pkg_config_default.go | 11 +++++++ sysutils/podman/files/podman.in | 16 +++++++--- sysutils/podman/files/podman_service.in | 37 ++++++++++++++++++++++ sysutils/podman/pkg-plist | 2 ++ 7 files changed, 78 insertions(+), 9 deletions(-) diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index 2aab47ccc394..2863dc20d3d8 100644 --- a/sysutils/podman/Makefile +++ b/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 @@ RUN_DEPENDS= conmon:sysutils/conmon \ 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 diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo index 2682cd62e28e..b49edcc0e33b 100644 --- a/sysutils/podman/distinfo +++ b/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 diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go new file mode 100644 index 000000000000..cb249eba1969 --- /dev/null +++ b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go @@ -0,0 +1,11 @@ +--- vendor/github.com/containers/common/pkg/config/config.go.orig 2023-07-21 12:24:32 UTC ++++ vendor/github.com/containers/common/pkg/config/config.go +@@ -51,7 +51,7 @@ const ( + BoltDBStateStore RuntimeStateStore = iota + ) + +-var validImageVolumeModes = []string{"bind", "tmpfs", "ignore"} ++var validImageVolumeModes = []string{"nullfs", "tmpfs", "ignore"} + + // ProxyEnv is a list of Proxy Environment variables + var ProxyEnv = []string{ diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_default.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_default.go new file mode 100644 index 000000000000..22dc4f54d2b8 --- /dev/null +++ b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_default.go @@ -0,0 +1,11 @@ +--- vendor/github.com/containers/common/pkg/config/default.go.orig 2023-07-21 12:24:39 UTC ++++ vendor/github.com/containers/common/pkg/config/default.go +@@ -28,7 +28,7 @@ const ( + _defaultTransport = "docker://" + + // _defaultImageVolumeMode is a mode to handle built-in image volumes. +- _defaultImageVolumeMode = "bind" ++ _defaultImageVolumeMode = "nullfs" + ) + + var ( diff --git a/sysutils/podman/files/podman.in b/sysutils/podman/files/podman.in index 89c5a95d4a8f..653f7cd25507 100755 --- a/sysutils/podman/files/podman.in +++ b/sysutils/podman/files/podman.in @@ -26,16 +26,24 @@ start_cmd="podman_start" 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 } diff --git a/sysutils/podman/files/podman_service.in b/sysutils/podman/files/podman_service.in new file mode 100755 index 000000000000..0ecb1b0197f3 --- /dev/null +++ b/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" diff --git a/sysutils/podman/pkg-plist b/sysutils/podman/pkg-plist index 6ed5aee4644f..34d9e1ff46ff 100644 --- a/sysutils/podman/pkg-plist +++ b/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-unmount.1.gz 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