Page MenuHomeFreeBSD
Files F153004537

D47910.id147489.diff
No OneTemporary
Actions

D47910.id147489.diff
View Options

diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile
--- 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
--- 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
--- 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
--- a/sysutils/buildah/pkg-message
+++ b/sysutils/buildah/pkg-message
@@ -3,6 +3,6 @@
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

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 2:17 PM (1 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31768234
Default Alt Text
D47910.id147489.diff (2 KB)

Event Timeline