Date: Tue, 11 Jun 2024 15:01:16 GMT From: Doug Rabson <dfr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 284ce500bc19 - main - sysutils/buildah: update to 1.36.0 Message-ID: <202406111501.45BF1Glh037081@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=284ce500bc1907629955c7d8d631f3cad0e24afe commit 284ce500bc1907629955c7d8d631f3cad0e24afe Author: Doug Rabson <dfr@FreeBSD.org> AuthorDate: 2024-06-05 11:59:33 +0000 Commit: Doug Rabson <dfr@FreeBSD.org> CommitDate: 2024-06-11 14:42:29 +0000 sysutils/buildah: update to 1.36.0 --- sysutils/buildah/Makefile | 3 +-- sysutils/buildah/distinfo | 6 +++--- sysutils/buildah/files/patch-Makefile | 12 ------------ sysutils/buildah/files/patch-run__common.go | 30 +++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile index 690407cc0699..1cd356b8d1b6 100644 --- a/sysutils/buildah/Makefile +++ b/sysutils/buildah/Makefile @@ -1,7 +1,6 @@ PORTNAME= buildah DISTVERSIONPREFIX= v -DISTVERSION= 1.33.2 -PORTREVISION= 4 +DISTVERSION= 1.36.0 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/buildah/distinfo b/sysutils/buildah/distinfo index 07b33af7495a..83ca8250b153 100644 --- a/sysutils/buildah/distinfo +++ b/sysutils/buildah/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702140631 -SHA256 (containers-buildah-v1.33.2_GH0.tar.gz) = 5e0bc3044158649983051c61330fe55e6e1f06ef98eed53861682ae54c2734ba -SIZE (containers-buildah-v1.33.2_GH0.tar.gz) = 18580150 +TIMESTAMP = 1717583837 +SHA256 (containers-buildah-v1.36.0_GH0.tar.gz) = c2dd61b3d31576c71001eae1b7cabd7e714bdef8dd7b84d8d59496f26810840d +SIZE (containers-buildah-v1.36.0_GH0.tar.gz) = 19328201 diff --git a/sysutils/buildah/files/patch-Makefile b/sysutils/buildah/files/patch-Makefile deleted file mode 100644 index 28ca8f17e473..000000000000 --- a/sysutils/buildah/files/patch-Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.orig 2024-01-05 15:47:24 UTC -+++ Makefile -@@ -78,7 +78,8 @@ internal/mkcw/embed/entrypoint: internal/mkcw/embed/en - $(LD) -o $@ $(patsubst %.s,%.o,$^) - strip $@ - else --.PHONY: internal/mkcw/embed/entrypoint -+internal/mkcw/embed/entrypoint: -+ touch $@ - endif - - internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint diff --git a/sysutils/buildah/files/patch-run__common.go b/sysutils/buildah/files/patch-run__common.go new file mode 100644 index 000000000000..e24ddede1c4e --- /dev/null +++ b/sysutils/buildah/files/patch-run__common.go @@ -0,0 +1,30 @@ +--- run_common.go.orig 2024-05-23 20:31:28 UTC ++++ 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 + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406111501.45BF1Glh037081>