From owner-dev-commits-ports-all@freebsd.org Tue Aug 31 16:14:35 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B0CB0671523; Tue, 31 Aug 2021 16:14:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GzXMH4Hhvz3LDK; Tue, 31 Aug 2021 16:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7278214CC4; Tue, 31 Aug 2021 16:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17VGEZoh045971; Tue, 31 Aug 2021 16:14:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17VGEZi1045970; Tue, 31 Aug 2021 16:14:35 GMT (envelope-from git) Date: Tue, 31 Aug 2021 16:14:35 GMT Message-Id: <202108311614.17VGEZi1045970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 306070e97f5c - main - sysutils/packer: Import an upstream patch to fix a runtime issue MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 306070e97f5c638aad9e9dd2512948b1f46c3989 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Aug 2021 16:14:35 -0000 The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=306070e97f5c638aad9e9dd2512948b1f46c3989 commit 306070e97f5c638aad9e9dd2512948b1f46c3989 Author: Mikael Urankar AuthorDate: 2021-08-31 16:12:49 +0000 Commit: Mikael Urankar CommitDate: 2021-08-31 16:12:49 +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) --- 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 +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 + }