Date: Tue, 31 Aug 2021 16:25:40 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: ff405cf7f4a2 - 2021Q3 - sysutils/packer: Import an upstream patch to fix a runtime issue Message-ID: <202108311625.17VGPe2V059977@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff405cf7f4a2881bc36c74e47a4dd839e54fd2e6 commit ff405cf7f4a2881bc36c74e47a4dd839e54fd2e6 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2021-08-31 16:12:49 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2021-08-31 16:19:34 +0000 sysutils/packer: Import an upstream patch to fix a runtime issue https://github.com/rconde01/govmomi/commit/f17e482482daf36650ad75d5f19b65306a03289a fix: make processing of mac addresses case insensitive Approved by: portmgr (runtime fix blanket) (cherry picked from commit 306070e97f5c638aad9e9dd2512948b1f46c3989) --- sysutils/packer/Makefile | 1 + ...b.com_vmware_govmomi_object_virtual__machine.go | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile index ff06d976b98f..d16e08d0f5f2 100644 --- a/sysutils/packer/Makefile +++ b/sysutils/packer/Makefile @@ -1,6 +1,7 @@ PORTNAME= packer PORTVERSION= 1.7.4 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= brad@facefault.org diff --git a/sysutils/packer/files/patch-vendor_github.com_vmware_govmomi_object_virtual__machine.go b/sysutils/packer/files/patch-vendor_github.com_vmware_govmomi_object_virtual__machine.go new file mode 100644 index 000000000000..e85080cc095e --- /dev/null +++ b/sysutils/packer/files/patch-vendor_github.com_vmware_govmomi_object_virtual__machine.go @@ -0,0 +1,41 @@ +https://github.com/rconde01/govmomi/commit/f6cd1b1a345750afe81c43a5b00855dd6bf84d8b + +From f6cd1b1a345750afe81c43a5b00855dd6bf84d8b Mon Sep 17 00:00:00 2001 +From: Rob Conde <Rob.Conde@ai-solutions.com> +Date: Mon, 5 Jul 2021 16:24:31 -0400 +Subject: [PATCH] fix: make processing of mac addresses case insensitive + +Closes: #2509 + +--- vendor/github.com/vmware/govmomi/object/virtual_machine.go.orig 2021-08-31 16:00:45 UTC ++++ vendor/github.com/vmware/govmomi/object/virtual_machine.go +@@ -22,6 +22,7 @@ import ( + "fmt" + "net" + "path" ++ "strings" + + "github.com/vmware/govmomi/nfc" + "github.com/vmware/govmomi/property" +@@ -333,7 +334,9 @@ func (v VirtualMachine) WaitForNetIP(ctx context.Conte + devices := VirtualDeviceList(c.Val.(types.ArrayOfVirtualDevice).VirtualDevice) + for _, d := range devices { + if nic, ok := d.(types.BaseVirtualEthernetCard); ok { +- mac := nic.GetVirtualEthernetCard().MacAddress ++ // Convert to lower so that e.g. 00:50:56:83:3A:5D is treated the ++ // same as 00:50:56:83:3a:5d ++ mac := strings.ToLower(nic.GetVirtualEthernetCard().MacAddress) + if mac == "" { + return false + } +@@ -369,7 +372,9 @@ func (v VirtualMachine) WaitForNetIP(ctx context.Conte + + nics := c.Val.(types.ArrayOfGuestNicInfo).GuestNicInfo + for _, nic := range nics { +- mac := nic.MacAddress ++ // Convert to lower so that e.g. 00:50:56:83:3A:5D is treated the ++ // same as 00:50:56:83:3a:5d ++ mac := strings.ToLower(nic.MacAddress) + if mac == "" || nic.IpConfig == nil { + continue + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108311625.17VGPe2V059977>