From nobody Tue Jun 11 15:01:16 2024 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 4VzBhF2M2Cz5M4yL; Tue, 11 Jun 2024 15:01:17 +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 4VzBhD5mqWz4qV0; Tue, 11 Jun 2024 15:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718118076; 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=LSk/9Wh8gjffLgydlSOgm1AVGIalk11iHYjaJrXr83g=; b=n96gZOKNi6rX0W0/6/vZkcj6dJEZLSyMRZaeI6dLscmxbRFWFmoW74RVRYU44Atp1wIat6 KoGsms8XvsGJntDgxMyTvx+W/hGgPmj2pzWsZasv+7/jHBM3yMkbjXEseaXbttu9aHjdPN kAhDyWs6rr9Cmct+efayvUM/aILUZwoH6O3wvHU/FgD4Ng7Lgf0lzX5v6l6CPhEuqhfH2U Kv0iTQlYaxY5nQbAcPRhqQPVYRbjoBEXtICONpW1EQdWOtMlWjvPpu7rJLGMFcV0YSoGZT UyARCltgUPT2NF7bn6NgaSLDTWfWJKkj9ArDuhXk0ovELN1aVw1dnJh9W3dyxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718118076; a=rsa-sha256; cv=none; b=oFzFBhWWZnpwnt0E2zA7naInF4XAn2a6fGBLZ+AscQ8yQ3YGXs0/E6CEiCdtVsAVY2w/dB e1SW1aIwGAEeuFvXcpAecfomYmB1IIrx+i8ZECsyCrx3nNJOWAjXY5euqyW89LCaJHQxaH m+cgS5pM1QeTgRbbY9O4Cr/DxbF6mYhbv3S92e8i/Zy4keZBbPQuQUFlkPIg88rRwHjA1X IMnUKs8KILbYOf8lDTvnFWQTP3j383+AtySHo7yek+TcPGZY9fqJvBCvQmwZF+9N9i8K4o Hvt3syuPL+VfzrpBTjjrxGLUi7Lers5MWQVeVO/J7BVghCCdPtQ9go7qW7bloQ== 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=1718118076; 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=LSk/9Wh8gjffLgydlSOgm1AVGIalk11iHYjaJrXr83g=; b=GxoBGDfn6FPzs7Sd6n0RValeh5PC4wWjkNWJ9kNMOVkACFwD2I0nTd+V75AWXyBI71x+rn kXQp4Ed2gYfcIGI19KzRgHimDFUUHbW1IKU9rrqwjOTugOtVLFF2rcIZpKhzButITpmJao 0qKUrsmxT/GPi3g2RiYsnx7nGxsvBCDMInjfCWYY9ooIBQCg76o6ZUxuUoM1K1nCLQXoEH BNmr+fSZfwsFOuSYxbA38cIOWXw5JCFIxtQai+nvYTmIfZYjT4ws7Ojxs+/IFuOWP3fpAu 3Q0H/vSk2Kl6xAyZPOcv03E02pErSFLgXiTtZ/tGqMnTQJXDedUtC0CXYLO/wg== 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 4VzBhD5LR6zDb6; Tue, 11 Jun 2024 15:01:16 +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 45BF1GrN037084; Tue, 11 Jun 2024 15:01:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BF1Glh037081; Tue, 11 Jun 2024 15:01:16 GMT (envelope-from git) Date: Tue, 11 Jun 2024 15:01:16 GMT Message-Id: <202406111501.45BF1Glh037081@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: 284ce500bc19 - main - sysutils/buildah: update to 1.36.0 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: dfr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 284ce500bc1907629955c7d8d631f3cad0e24afe Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=284ce500bc1907629955c7d8d631f3cad0e24afe commit 284ce500bc1907629955c7d8d631f3cad0e24afe Author: Doug Rabson AuthorDate: 2024-06-05 11:59:33 +0000 Commit: Doug Rabson 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 + }