From nobody Mon Aug 19 15:01:14 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 4WnbQM07rfz5T9s7; Mon, 19 Aug 2024 15:01:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WnbQL1swwz41t8; Mon, 19 Aug 2024 15:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724079674; 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=Hc7KfHPlO4y8eB6x3QGiR624GJY8i8smuEKBAw/2+/Y=; b=rw0D/2Th3vJI/e06blrhaO1UDY4yfh2Bx7VxQS8xwfDCCRqWjmTmkT9UAcGjo+gtCgYLge 7Mpa48e+Ka2nYrHAPyZs1MVehfeHamwyyDyYOqJ4yn5FoeBDqruLQJBheKR08eeaBo3Dw1 p4RsKnm9JFRDi7tFrKDniIaAgxCW74YJuS8sF8jNZch8z2jNoh0yWs+1Svdjzz7libtgM4 iSSZfNJLFKwacaBWJ+1gZHlduIB7iuMwcm7JxHWfHdztJ5fileKr3+tT3L7KQw/5gplxyi YfvKXE82lhVnqM3V/5X6cw873T0ik+Zim05VzKuB0ZKcpadnehweOnyPzDIqbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724079674; a=rsa-sha256; cv=none; b=ALesm5h2vw06zvT0LE/4NnOCQlrmuTtBMT9NAGDb9wppwZPpZx29qmks1jarzZqAkpKFEZ CzZpZ60y85Vw+ecumd/o281QHlqMSHWzkQtoPhMeGz+PEslmoys1hXIKENnMDSaZ7xpDcD K9beFjy8nPMSvt7tf3GKukzaAvZ/fKJJCaR3QLJc85cf24ksGGesuxw7Js+88haihXoyGe xJPClS/lYDrw9WGMC6fXp89sZ8QnaaikAsDo5oON5+PysbdQotcQTSo1woOepbMWS0iOAq +KHExil1X7B5VLDAnlDzt375+D5gJhBH0GjY7JAGr75Qg8XzkdL6sL2upNdyKg== 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=1724079674; 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=Hc7KfHPlO4y8eB6x3QGiR624GJY8i8smuEKBAw/2+/Y=; b=szroJh5doJcWntaQCrEWpI4BtaVEujhXDbPjZv+ufYOWekHjrOFwAQhvwYDDqsfDujb5zH OfatasdPwJTGnpYRn0hVGVLGvHEJqi+E2vSaB+5txYk9LDpdFHAKMdDSVCna3RHYf0IklV cgo2X9ZKX8sy2y8/TXyhlDxXzFQ2+cAgcZpkCjfx4MmSIKw2xe/VX/y6TFSMhWh+fDIyKs 3shvHGOYA63nCnUoEYFU8/wuqjvez2Gyk0Br8M+MlRVvNHwIsLdyrFTy4BId3ds9Xa9CYe +ww5JWipOERC9RePKbCcux8Qqf3CoI+SQC0Xww6YR5GtySEQZTZWneYtY0nMIg== 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 4WnbQL1St9zLsx; Mon, 19 Aug 2024 15:01:14 +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 47JF1E5j039922; Mon, 19 Aug 2024 15:01:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47JF1EtT039919; Mon, 19 Aug 2024 15:01:14 GMT (envelope-from git) Date: Mon, 19 Aug 2024 15:01:14 GMT Message-Id: <202408191501.47JF1EtT039919@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: 551dc594fa51 - main - sysutils/builldah: fix a nil pointer dereference 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: 551dc594fa51779c7773129fdc8f97dc9aaa81c0 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=551dc594fa51779c7773129fdc8f97dc9aaa81c0 commit 551dc594fa51779c7773129fdc8f97dc9aaa81c0 Author: Doug Rabson AuthorDate: 2024-08-19 13:04:46 +0000 Commit: Doug Rabson CommitDate: 2024-08-19 15:00:28 +0000 sysutils/builldah: fix a nil pointer dereference Attempting to use 'buildah run --network=host' caused a nil pointer dereference while setting up the container's resolv.conf file. PR: 280777 --- sysutils/buildah/Makefile | 2 +- sysutils/buildah/files/patch-run__freebsd.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile index 0eb5d589d29e..1eca063b3433 100644 --- a/sysutils/buildah/Makefile +++ b/sysutils/buildah/Makefile @@ -1,7 +1,7 @@ PORTNAME= buildah DISTVERSIONPREFIX= v DISTVERSION= 1.36.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/buildah/files/patch-run__freebsd.go b/sysutils/buildah/files/patch-run__freebsd.go new file mode 100644 index 000000000000..d920a21327eb --- /dev/null +++ b/sysutils/buildah/files/patch-run__freebsd.go @@ -0,0 +1,11 @@ +--- run_freebsd.go.orig 2024-08-18 10:59:26 UTC ++++ run_freebsd.go +@@ -244,7 +244,7 @@ func (b *Builder) Run(command []string, options RunOpt + // Only add entries here if we do not have to do setup network, + // if we do we have to do it much later after the network setup. + if !configureNetwork { +- err = b.addResolvConfEntries(resolvFile, nil, nil, false, true) ++ err = b.addResolvConfEntries(resolvFile, nil, spec, false, true) + if err != nil { + return err + }