git: 551dc594fa51 - main - sysutils/builldah: fix a nil pointer dereference
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 19 Aug 2024 15:01:14 UTC
The branch main has been updated by dfr:
URL: https://cgit.FreeBSD.org/ports/commit/?id=551dc594fa51779c7773129fdc8f97dc9aaa81c0
commit 551dc594fa51779c7773129fdc8f97dc9aaa81c0
Author: Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2024-08-19 13:04:46 +0000
Commit: Doug Rabson <dfr@FreeBSD.org>
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
+ }