From nobody Wed Dec 4 17:08:58 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 4Y3PBL6KhTz5ftJ1; Wed, 04 Dec 2024 17:08:58 +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 4Y3PBL4nGWz4kln; Wed, 4 Dec 2024 17:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332138; 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=A+iHV9eMO73J6k/cuPs8WwjhHn4B8wN9MNftSVkKOsI=; b=JlaLwX/DzPQdxokFIXWhpxbQQ0sJvd04rjqcVP0lJQUuJXBWB0zKKRZh9fB8CLYny0jlg7 naq2rM3+sCvcMTnzRohPPRcC9NFtg18hZyJtC+VfqhCeRfuBj7uazVe8k7gNJjzTCk8r0c SffhX9CRotKJRF2sHjwZ49rmy7G9aapi1VKs4+/oQbVzdT23qjMaAJqPq9k+arJbgd+xWu 00tDocwovK2POeVncn7FxQLsf0xa4TRaCSGoEMaXtpY9pbvjlkfjF3P6OAQKJTSluvnSzW 38hrieEykfzhKAPnMiswgvinHOKB3cjA+WkAlJrZAtmQXSAufWNWKQ1aV06Yrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733332138; 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=A+iHV9eMO73J6k/cuPs8WwjhHn4B8wN9MNftSVkKOsI=; b=aNZjgjjQ8JQovKW36WgBSbNYbNcuiwLFdMGbU/z9tzHKITlbQdtVyzsQq91lCsoCtoDTMy n/4kaQZIRTBebkzdc0qIsfSqkPg3a/F49znJfG0sAuHrgZKzFuIuuL5MxgTA0ACP5VSBQi y+vut+WjoD4RpyXmRzH8hqgTmZpkuuV6fr/xN3tgsBQe71HAYDL1dvdn2as9ZOA/eOCocO fwRCzJ+yf5oFFluyk2xkrImIWDO5jbvHHjKo+pCYaiGtYj7+T4nMdseYJgXLia0eLQc5ub QED2eRXNWbm01EUW6UgMEl/6p8xZKXz5HNWAChIZ/5tR/nXI20yU6RKirXLJ2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733332138; a=rsa-sha256; cv=none; b=e+hW9AkjMoXP4KQCQkg6JjCw6hNzYvGmjJ9ZZJ0U6yAD3n2c8+D3jYMKgsNgYD/NhE3I1p wYAyXsDuRcWgSFHzdCe1+NqSyXuvaTCXe6uM3PYng9ICpdftM7hyPXOML5ofIIrB0xGG6S 9irTvK/YgKSJ6aXS3hZ938/w3GmjRDlIDdBdijgBLRgBdZj92+JH4J+uD6uBXcmZN3thWQ NDcEY/AuCVUgbB6kadFXAvlyt3XvCjkt491iavzZqnGkh3WYia3xzRdZVDbX4W423Dk4n4 DlAZEGJHnB2LRIG9C136ReIS0atYyje/bK73zYPQKQVpQ3TNSP8Ig5WSfm4DDw== 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 4Y3PBL43LNzGT0; Wed, 4 Dec 2024 17:08:58 +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 4B4H8wS5011625; Wed, 4 Dec 2024 17:08:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4H8wQ9011622; Wed, 4 Dec 2024 17:08:58 GMT (envelope-from git) Date: Wed, 4 Dec 2024 17:08:58 GMT Message-Id: <202412041708.4B4H8wQ9011622@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: c23717d1b6de - main - sysutils/buildah: update from 1.36.0 to 1.37.5 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c23717d1b6de112ef54b6c450081ed2e8d1c6012 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=c23717d1b6de112ef54b6c450081ed2e8d1c6012 commit c23717d1b6de112ef54b6c450081ed2e8d1c6012 Author: Sergey A. Osokin AuthorDate: 2024-12-04 17:02:13 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-04 17:02:13 +0000 sysutils/buildah: update from 1.36.0 to 1.37.5 Approved by: dfr (maintainer) Differential Revision: https://reviews.freebsd.org/D47910 --- sysutils/buildah/Makefile | 3 +-- sysutils/buildah/distinfo | 6 +++--- sysutils/buildah/files/patch-run__common.go | 30 ----------------------------- sysutils/buildah/pkg-message | 4 ++-- 4 files changed, 6 insertions(+), 37 deletions(-) diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile index 1eca063b3433..6325cc816cdc 100644 --- a/sysutils/buildah/Makefile +++ b/sysutils/buildah/Makefile @@ -1,7 +1,6 @@ PORTNAME= buildah DISTVERSIONPREFIX= v -DISTVERSION= 1.36.0 -PORTREVISION= 4 +DISTVERSION= 1.37.5 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/buildah/distinfo b/sysutils/buildah/distinfo index 83ca8250b153..212d1e6db279 100644 --- a/sysutils/buildah/distinfo +++ b/sysutils/buildah/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717583837 -SHA256 (containers-buildah-v1.36.0_GH0.tar.gz) = c2dd61b3d31576c71001eae1b7cabd7e714bdef8dd7b84d8d59496f26810840d -SIZE (containers-buildah-v1.36.0_GH0.tar.gz) = 19328201 +TIMESTAMP = 1733324771 +SHA256 (containers-buildah-v1.37.5_GH0.tar.gz) = 1cc94713976d5b580fdda6c523674237af17d2d48141dbf7d029de3e66592a08 +SIZE (containers-buildah-v1.37.5_GH0.tar.gz) = 19323742 diff --git a/sysutils/buildah/files/patch-run__common.go b/sysutils/buildah/files/patch-run__common.go deleted file mode 100644 index e24ddede1c4e..000000000000 --- a/sysutils/buildah/files/patch-run__common.go +++ /dev/null @@ -1,30 +0,0 @@ ---- 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 - } diff --git a/sysutils/buildah/pkg-message b/sysutils/buildah/pkg-message index 76efcc670277..929be810755b 100644 --- a/sysutils/buildah/pkg-message +++ b/sysutils/buildah/pkg-message @@ -3,6 +3,6 @@ be used for evaluation and testing purposes only. Basic usage follows: -$ export c=$(sudo buildah from quay.io/dougrabson/freebsd-minimal:13.1) -$ sudo buildah run $c freebsd-version -run +$ export c=$(sudo buildah from quay.io/dougrabson/freebsd14-minimal) +$ sudo buildah run $c freebsd-version -ru $ sudo buildah run $c ping -c 3 9.9.9.9