From nobody Fri Feb 04 19:10:27 2022 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 63ECC19A27D2; Fri, 4 Feb 2022 19:10:27 +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 4Jr4ql2QdPz3k57; Fri, 4 Feb 2022 19:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644001827; 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=NtBDr7dZHz+UQz3a+uIqK2jFFzBNIGxJFSELF/TiNKg=; b=RlZUMsvihFdHlhCL/OT8Ogd9ulDhAIhyetU7CITtYr+1s7JrNkM5mzw52sfMavJ3/7O1Rb hE068dXGw7d5BW9U0DtDzT4l0oxDPa81Fb8ONe5cFqH2Q77vVFTwBs7nwb4e/Rtrq5SaUY IITN7ERonan/Lwl7WC/MPrKEyYuQ2yLHTvt8NXRZs3I5hdJYdW7UM6lf3zIEX1loiI2PXi 3NUPleHJxUcB+nlGg3zETzRC5VTBtLYWtA2RjGVjo2wrkQ2U8/FieIVAF9e/C6jII8I6Da kgIsTjXMNxTEGp5MLmpNqPdMSTv4mzLt/9MSRBwsRfrTjrdddn84Q/BjLUDOrA== 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 3388E1140D; Fri, 4 Feb 2022 19:10:27 +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 214JARmb034825; Fri, 4 Feb 2022 19:10:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 214JAR73034824; Fri, 4 Feb 2022 19:10:27 GMT (envelope-from git) Date: Fri, 4 Feb 2022 19:10:27 GMT Message-Id: <202202041910.214JAR73034824@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: 491b15ab8eeb - main - emulators/open-vm-tools: Fix build on current 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: 491b15ab8eebb36886d344bbf262a515bb46b6cd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644001827; 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=NtBDr7dZHz+UQz3a+uIqK2jFFzBNIGxJFSELF/TiNKg=; b=IbQGHvcNYWdyY6XtHQTDbOOY0VlqrCY4S2OH6fZAuQlNPfCXQeJyaugaZU5XZLBGiT1ZzX zCBzzHKMLHeqLQ4MpS/7nypKoR8E/pODUxol2H2h6EXOdiqyzkaObER/LidgLHzRBri+RG zBB6OR45tU4ThodY/AaS//NxKCOp51ir0HFwPUlFhySGG4zl7C2ZwVe6/ZewcQA9jJ7mLn ml170N8VBiONGdb90ZH1bqAC0+hApSFaBNLwyem4hn4C0h05sLTgf3VL1KnYg2aClI+S0G 59GA/9Jjr7zRYsi16bKxsXr6ljaEbym5j3H4hDG1sPplk7Eg0TzpNngdxq7+uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644001827; a=rsa-sha256; cv=none; b=J9jT+bBpk3tzF87XaA/ybRoq1NJnYA+3PgxIG3cgv89XY2HXglDUmtiqdPRNfTykKPNdK5 cN2UiaVHnCajRaJ7ZchuO94LUMcSKfb6bOTDDJC7suF/XcLPDAaZj/su1Io4Tjs70ID7zb 8viVIXq16rlyYqKU50OfztEi5ZPpM2DMUx6hhR7Oem7Lh4SvuD+raSArlNDBRNKTDZ4Od9 nvNGR2zytOR8P517kiOVDMoq0voK+zGKpFEkWSqoONzjkeMTvXMcAQ91U6WJRa9Qttimw8 5TM8WcsVdpw4v0mrZZC6egvRHDiQgoAS7thY+T17tZK4MSHjO/VxOiVGGRU7hA== 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=491b15ab8eebb36886d344bbf262a515bb46b6cd commit 491b15ab8eebb36886d344bbf262a515bb46b6cd Author: Renato Botelho AuthorDate: 2022-02-04 19:07:24 +0000 Commit: Renato Botelho CommitDate: 2022-02-04 19:10:16 +0000 emulators/open-vm-tools: Fix build on current After src commit 66c5fbca7719dca1ac361a010fa511a4514a662d, insmntque1() changed to have only 2 arguments, breaking open-vm-tools. Added a patch to call the new version on recent current and call destructor to make sure it runs. Suggested by: kib Sponsored by: Rubicon Communications, LLC ("Netgate") --- emulators/open-vm-tools/Makefile | 2 +- .../files/patch-modules_freebsd_vmblock_subr.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index e243cf0085bf..53b597627f74 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -2,7 +2,7 @@ PORTNAME= open-vm-tools PORTVERSION= 11.3.5 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= stable- PORTEPOCH= 2 CATEGORIES= emulators diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_subr.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_subr.c new file mode 100644 index 000000000000..c64602d1b9e5 --- /dev/null +++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_subr.c @@ -0,0 +1,17 @@ +--- modules/freebsd/vmblock/subr.c.orig 2022-02-04 12:59:09 UTC ++++ modules/freebsd/vmblock/subr.c +@@ -392,7 +392,13 @@ VMBlockNodeGet(struct mount *mp, // IN: VMBlock + } + + /* Before FreeBSD 7, insmntque was called by getnewvnode. */ +-#if __FreeBSD_version >= 700055 ++#if __FreeBSD_version >= 1400051 ++ error = insmntque1(vp, mp); ++ if (error != 0) { ++ VMBlockInsMntQueDtr(vp, xp); ++ return error; ++ } ++#else + error = insmntque1(vp, mp, VMBlockInsMntQueDtr, xp); + if (error != 0) { + return error;