From nobody Tue Nov 30 19:42:33 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9941B18AE757; Tue, 30 Nov 2021 19:42:33 +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 4J3XgF1zrWz4dDL; Tue, 30 Nov 2021 19:42:33 +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 1B71C1C2A8; Tue, 30 Nov 2021 19:42:33 +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 1AUJgXL7008553; Tue, 30 Nov 2021 19:42:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AUJgXmx008551; Tue, 30 Nov 2021 19:42:33 GMT (envelope-from git) Date: Tue, 30 Nov 2021 19:42:33 GMT Message-Id: <202111301942.1AUJgXmx008551@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: ecfed7ee5cb8 - main - emulators/open-vm-tools: Fix build after 1400043 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecfed7ee5cb8f6cef90628a3df1ace1011b5dc17 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638301353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WX4PqPSQOCHOgCWjyfijBRUMoPfv1litnQKuEjaV+so=; b=kIjsKaKMcOjzJgjz2rlIrX+45lARjEUnaDBghQZfTeLk9bHuURukZD6b0WTtH6U2Y7wuTc BLGUpxeSaGzUKHZVbF0F7CwElhCcmaYFufx1AcMpv6aga5/L252QrRCneY7gdqC9wR2BrN LdH+nQsPAfdsvB1oF6P0rVyQthT5LqSGKiyr8cz0Kvqi62oskh6etJ7WUDfonImgrlhrcy w55Nnb9WECs0sqC48Bj25irJLPoBuj4g8Uat7+KDw9YKlM6NBPzeZLCTb7Y3KH3mdQLJ/T F6wYtN7cICab2KVMIYBhf4Pm8uFJ0okasUxt3dwBwkUk3dmuVzgxkdT/e5I3WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638301353; a=rsa-sha256; cv=none; b=M7oWL7Srfk/EP4tij0X68ovTGz+3Npz82LXrQWeWqYs8kUiwthCNQHBcwulbokJR2m3dUJ 0RxZuUzP7MpooWlhy0x0mx10r4e75wVWY5jELbXB+PekGs7h+zA0J53l1QXw/KwmD/Hxaz AVTb/o4vHFb5AdAmXHm9ICc2uHaxAFVmGyPkKm3KrtqG74YGh8oUvTQx12fC9eOJ15DVX3 pcAhNbRwf0XLiWjoUjGuxLm0C2xb3zMYXf/Yzwi7eHAXmaONhVhv/mWJmPISWvCWaGD3mF 6Dy/7saIH2Js4hk7Er0lAv2W2RTyM4iBAqT5TBl/cy7qfVxDIkLuK91GJCuJBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecfed7ee5cb8f6cef90628a3df1ace1011b5dc17 commit ecfed7ee5cb8f6cef90628a3df1ace1011b5dc17 Author: Renato Botelho AuthorDate: 2021-11-30 19:22:19 +0000 Commit: Renato Botelho CommitDate: 2021-11-30 19:23:59 +0000 emulators/open-vm-tools: Fix build after 1400043 NDINIT() last parameter was removed after this osversion Sponsored by: Rubicon Communications, LLC ("Netgate") --- emulators/open-vm-tools/Makefile | 1 + .../files/patch-modules_freebsd_vmblock_vfsops.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index e23eb0d8a213..e243cf0085bf 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -2,6 +2,7 @@ PORTNAME= open-vm-tools PORTVERSION= 11.3.5 +PORTREVISION= 1 DISTVERSIONPREFIX= stable- PORTEPOCH= 2 CATEGORIES= emulators diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c index 29639a7ac6bf..1b05ca6c1e9c 100644 --- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c +++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c @@ -1,4 +1,4 @@ ---- modules/freebsd/vmblock/vfsops.c.orig 2018-03-30 18:44:35 UTC +--- modules/freebsd/vmblock/vfsops.c.orig 2021-09-24 04:19:18 UTC +++ modules/freebsd/vmblock/vfsops.c @@ -124,6 +124,11 @@ VMBlockVFSMount(struct mount *mp, // IN: mount( char *pathname; @@ -12,7 +12,19 @@ VMBLOCKDEBUG("VMBlockVFSMount(mp = %p)\n", (void *)mp); /* -@@ -276,6 +281,11 @@ VMBlockVFSUnmount(struct mount *mp, // IN: filesyst +@@ -171,7 +176,11 @@ VMBlockVFSMount(struct mount *mp, // IN: mount( + * Find lower node and lock if not already locked. + */ + ++#if __FreeBSD_version >= 1400043 ++ NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target); ++#else + NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target, compat_td); ++#endif + error = namei(ndp); + if (error) { + NDFREE(ndp, 0); +@@ -276,6 +285,11 @@ VMBlockVFSUnmount(struct mount *mp, // IN: filesyst void *mntdata; int error; int flags = 0, removed = 0;