From nobody Wed Dec 04 17:08:57 2024 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 4Y3PBK4R0hz5ftHy; Wed, 04 Dec 2024 17:08:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3PBK3wp1z4kjW; Wed, 4 Dec 2024 17:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332137; 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=Zv32DN+evZ3uwhpSM2mfysfwRz4JFLcWYKcnP7DOXH8=; b=D/wTkgpfUknbL/ja46UEe6nugqXaZOHYvnYlRg+j1oidvO5wYDy6oB1a3iWkz7+l1m2nas lrotplYvLKUPsBSO4FY/xvKEWKzRNDL/go6ROvWmKl6sm+yExNJe87hf5fPtxVprvGcfX7 VnrakV3URb/yg9NTwjQQ/ma1r0D8bXtK0/kxC2lSiTKniCnpTIdX+vsdAdOen7OsFzccPE T5D08rYEJxlSyf8Ke4TMfkG+BBJnRq/C6mJDp6lwgK8yK8JKviR3f35LPBhsZ2wkw+cXAp 1zkLVsaTKyR9nHb3mvkfOrI64cEdArvjuSEcKNHHEfxT6foWHxbEQ2T1htuHCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332137; 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=Zv32DN+evZ3uwhpSM2mfysfwRz4JFLcWYKcnP7DOXH8=; b=oco14jCQfLtly4IFNnRFci6+xomfT+gCg15MqfM2nKAQIovIYNsJYedRD9njpiHQfgqKpq mN/HI8++mdehT4UF0ZvJty7amERfmF4b1xq4mucNvGjDf+CcDBTNrwkk0AH624pQH8148y v6RWhjPEUIMr3V1n0SBifMvoaiHxj7Epj2MVbYW4yalX/ueVF/So7bcBxVu9qHHzJOzMyR euWMjV7/Goubm/ZnPXad58GJ7/x+gBbD2IdagN/9b8rIrWz0sypKCDCklb832eYjiMTWGr O3VZGkv6qDdmWCG9IrIdjIFd04IXqRtgC7h0DDn9LD0ptJPFBN8yb3kcj90sKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733332137; a=rsa-sha256; cv=none; b=Fc+G2qPU3EsBW+agZIJsiFasXMCDu/xvEO3nF5AqVqQKGWC6ZDFgQTqpF9CA2ZvNhuU5fZ VnDSXtEiGR/Yw8s2DwT26DzanHgekWsGDW75JAQPOYhdwYA95I54fOyYERZcsC8dOK5ynU ZvYno8x3LFw5REPJq4uU0z8ouiFTCdLxaWCm4XFfZUBhOaxr683GVbw0bM+0ecf3oARksw /8RZ2NM4FUHwVEsx3q2wM2i7WGemnRRYwSYPxM1Q82tuL3FtzazLYeYM88l7BUSi+K986H 7wS/CMHBiCey7HALzePdij+tRs35mJ8hOgcXGuu9ZYxDAlC3i3D9aALj2D9zGg== 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 4Y3PBK30kpzFGX; Wed, 4 Dec 2024 17:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4H8v2t011577; Wed, 4 Dec 2024 17:08:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4H8vcb011574; Wed, 4 Dec 2024 17:08:57 GMT (envelope-from git) Date: Wed, 4 Dec 2024 17:08:57 GMT Message-Id: <202412041708.4B4H8vcb011574@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: c8e77928f479 - main - sysutils/podman: update from 5.1.1 to 5.2.5 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8e77928f479b38eeb2d0fd04590585930237641 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8e77928f479b38eeb2d0fd04590585930237641 commit c8e77928f479b38eeb2d0fd04590585930237641 Author: Sergey A. Osokin AuthorDate: 2024-12-04 16:59:48 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-04 16:59:48 +0000 sysutils/podman: update from 5.1.1 to 5.2.5 Approved by: dfr (maintainer) Differential Revision: https://reviews.freebsd.org/D47877 --- sysutils/podman/Makefile | 3 +-- sysutils/podman/distinfo | 6 ++--- sysutils/podman/files/patch-libpod_kube.go | 11 -------- ...or_github.com_containers_buildah_run__common.go | 30 ---------------------- sysutils/podman/pkg-plist | 9 ++++--- 5 files changed, 9 insertions(+), 50 deletions(-) diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index b6e1e314eed6..0377fd95331f 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,7 +1,6 @@ PORTNAME= podman DISTVERSIONPREFIX= v -DISTVERSION= 5.1.1 -PORTREVISION= 7 +DISTVERSION= 5.2.5 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo index c3e793311228..dacdb9d58acc 100644 --- a/sysutils/podman/distinfo +++ b/sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717584025 -SHA256 (containers-podman-v5.1.1_GH0.tar.gz) = ba1022c467dbc3e551e4d391dc6a5c03f33040a0764304b334afd7c6217c4894 -SIZE (containers-podman-v5.1.1_GH0.tar.gz) = 23794366 +TIMESTAMP = 1733223741 +SHA256 (containers-podman-v5.2.5_GH0.tar.gz) = 18bbf2c26534229c030590d65da88154bed31f0207041d30fed5f508b933a66c +SIZE (containers-podman-v5.2.5_GH0.tar.gz) = 23834863 diff --git a/sysutils/podman/files/patch-libpod_kube.go b/sysutils/podman/files/patch-libpod_kube.go deleted file mode 100644 index 64ae53b72347..000000000000 --- a/sysutils/podman/files/patch-libpod_kube.go +++ /dev/null @@ -1,11 +0,0 @@ ---- libpod/kube.go.orig 2024-06-05 10:44:10 UTC -+++ libpod/kube.go -@@ -1308,7 +1308,7 @@ func generateKubeSecurityContext(c *Container) (*v1.Se - scHasData = true - sc.ReadOnlyRootFilesystem = &ro - } -- if c.config.Spec.Linux.MaskedPaths == nil { -+ if c.config.Spec.Linux != nil && c.config.Spec.Linux.MaskedPaths == nil { - scHasData = true - unmask := v1.UnmaskedProcMount - sc.ProcMount = &unmask diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__common.go b/sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__common.go deleted file mode 100644 index 869f92f72b7e..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__common.go +++ /dev/null @@ -1,30 +0,0 @@ ---- vendor/github.com/containers/buildah/run_common.go.orig 2024-08-20 09:45:05 UTC -+++ vendor/github.com/containers/buildah/run_common.go -@@ -83,12 +83,17 @@ func (b *Builder) addResolvConfEntries(file string, ne - - // addResolvConf copies files from host and sets them up to bind mount into container - func (b *Builder) addResolvConfEntries(file string, networkNameServer []string, -- namespaces []specs.LinuxNamespace, keepHostServers, ipv6 bool) error { -+ spec *specs.Spec, keepHostServers, ipv6 bool) error { - defaultConfig, err := config.Default() - if err != nil { - return fmt.Errorf("failed to get config: %w", err) - } - -+ var namespaces []specs.LinuxNamespace -+ if spec.Linux != nil { -+ namespaces = spec.Linux.Namespaces -+ } -+ - dnsServers, dnsSearch, dnsOptions := b.CommonBuildOpts.DNSServers, b.CommonBuildOpts.DNSSearch, b.CommonBuildOpts.DNSOptions - nameservers := make([]string, 0, len(defaultConfig.Containers.DNSServers.Get())+len(dnsServers)) - nameservers = append(nameservers, defaultConfig.Containers.DNSServers.Get()...) -@@ -1253,7 +1258,7 @@ func (b *Builder) runUsingRuntimeSubproc(isolation def - } - - if resolvFile != "" { -- err = b.addResolvConfEntries(resolvFile, netResult.dnsServers, spec.Linux.Namespaces, netResult.keepHostResolvers, netResult.ipv6) -+ err = b.addResolvConfEntries(resolvFile, netResult.dnsServers, spec, netResult.keepHostResolvers, netResult.ipv6) - if err != nil { - return err - } diff --git a/sysutils/podman/pkg-plist b/sysutils/podman/pkg-plist index bfe3ee194bcc..892b3c724663 100644 --- a/sysutils/podman/pkg-plist +++ b/sysutils/podman/pkg-plist @@ -1,7 +1,6 @@ bin/podman -bin/podmansh bin/podman-remote -@dir libexec/podman +bin/podmansh share/bash-completion/completions/podman share/bash-completion/completions/podman-remote share/fish/vendor_completions.d/podman-remote.fish @@ -185,14 +184,15 @@ share/man/man1/podman-secret.1.gz share/man/man1/podman-start.1.gz share/man/man1/podman-stats.1.gz share/man/man1/podman-stop.1.gz +share/man/man1/podman-system-check.1.gz share/man/man1/podman-system-connection-add.1.gz share/man/man1/podman-system-connection-default.1.gz share/man/man1/podman-system-connection-list.1.gz share/man/man1/podman-system-connection-remove.1.gz share/man/man1/podman-system-connection-rename.1.gz share/man/man1/podman-system-connection.1.gz -share/man/man1/podman-system-events.1.gz share/man/man1/podman-system-df.1.gz +share/man/man1/podman-system-events.1.gz share/man/man1/podman-system-info.1.gz share/man/man1/podman-system-migrate.1.gz share/man/man1/podman-system-prune.1.gz @@ -224,7 +224,8 @@ 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/man/man5/quadlet.5.gz share/zsh/site-functions/_podman share/zsh/site-functions/_podman-remote +@dir libexec/podman