mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

sysutils/packer: Import an upstream patch to fix a runtime issue

Browse Source 
f17e482482
fix: make processing of mac addresses case insensitive

Approved by:	portmgr (runtime fix blanket)
This commit is contained in:
Mikael Urankar 2021-08-31 18:12:49 +02:00
parent ecdbe7a9e9
commit 306070e97f
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/packer/Makefile
View File

@ -1,6 +1,7 @@
PORTNAME= packer
PORTVERSION= 1.7.4
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= brad@facefault.org

41
sysutils/packer/files/patch-vendor_github.com_vmware_govmomi_object_virtual__machine.go Normal file
View File

@ -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
}