diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index 026fe23f68e9..06c620719424 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,44 +1,43 @@ PORTNAME= podman DISTVERSIONPREFIX= v -DISTVERSION= 4.6.0 -PORTREVISION= 1 +DISTVERSION= 4.6.1 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:build shebangfix USE_RC_SUBR= podman podman_service SHEBANG_FILES= ${WRKSRC}/hack/markdown-preprocess MAKE_ARGS= SHELL=${LOCALBASE}/bin/bash # 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 INSTALL_TARGET= install install.completions # Temporary until https://github.com/containers/podman/pull/16422 lands do-install: ${GMAKE} -C ${WRKSRC} ${MAKE_ARGS} DESTDIR=${STAGEDIR} GO=${GO_CMD} install ${GMAKE} -C ${WRKSRC} ${MAKE_ARGS} 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 b49edcc0e33b..ca02879e1b06 100644 --- a/sysutils/podman/distinfo +++ b/sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689924226 -SHA256 (containers-podman-v4.6.0_GH0.tar.gz) = a1b4fd7c3a9b850ab4b405f8d03115248a780c89b11e7d8ffbba2d1f668f678e -SIZE (containers-podman-v4.6.0_GH0.tar.gz) = 17458408 +TIMESTAMP = 1692268708 +SHA256 (containers-podman-v4.6.1_GH0.tar.gz) = 6b3bfdc5ea9ca91f19b569d5a0763403823bde64be895060ec81dde4df692745 +SIZE (containers-podman-v4.6.1_GH0.tar.gz) = 17643650 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 deleted file mode 100644 index cb249eba1969..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 22dc4f54d2b8..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_default.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 (