From nobody Mon Dec 19 21:34:16 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 4NbXyx1lBvz1H6M4; Mon, 19 Dec 2022 21:34:17 +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 4NbXyx1HSHz4Qdd; Mon, 19 Dec 2022 21:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671485657; 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=PMQRxwvLAhkXkW+ab3I012oX8BVnZxvfzjDOHawCaZI=; b=UWtTGfldwSpYO1+mrYXxGNLPoaXqU62XIhqQGBkBKm1JtkxCpi1r+f1JnMOlB4fHZFNzbT 22KbPorFVBowphvxJ9DdCtenug8h5X1EL8JN8F50x1eNZFwr3R3Dvvbg5iSHW4g0dw5eGA HK4+nBexrvwPNWuaEthnvxNJf4Nc09PuZ6TWqk/V/fOU3A6YNGiiZD0g0zalefW8lx7q3D kbqWrT6ySAMsVpjJWcifbQHK0Wr2KR2T4VTTfsjyV/jgsV7Vg3GmHWqB+XlvG1dUykZQmJ pogkrjOh0XUOSI+DF0aqXX7s0mJI38nvhcH7gbjiCeZFr9cVYJ5HeQKZPchEUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671485657; 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=PMQRxwvLAhkXkW+ab3I012oX8BVnZxvfzjDOHawCaZI=; b=cmMHIBqNjOsuXWZB+Sul4KCmZbhTaYVlpaZm6CONT3p2XH+YZftITNSlIVdairq+trPc1o sV0kBh8lqFMceqW3+6ps5jG6RKxIydxwjBgm7qdwWM8Bcz5RRt+X46vdDVL0RN7VcxWRti Gb/64+6/KgvgxWKSlGhaMwSfVas+t0sTBPAEYmkHlVVrHIz7t7uO1fnZnYsV288sTnElpr YuDFF0XDFoZ58x0oZwXYu3IoIKmK9wGwRH02iaTq1+pheP6lRVeE3v6GvMbhfETYWm3oVM sl58rr6bx2FHnvmmWDAjs6IFOD0njxUj9tlpiQVxYMK/gxG/P9kLD8B2w8aVHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671485657; a=rsa-sha256; cv=none; b=Yg7tfnis5LWR4e58HG5moBej8CMXT2axiKYaIhZhrs7hkHVvNQ6E75kSssU6SUvYAk+Do3 EK9vgv3GyLk/W0Kdrw2bJNBMEuTn8YD4wOlqRukYry+1tg6gMYv9DzcX/pUDlh3uLkjPPH Hu2UkHkyjjzfmh3sCkY63gvyCO1yW7JWBOGCD5PhgQGx72LmQ3jabHEv+krtE86Q3w1WbV PzTf+5DI6Y4fFM5FHr3CBP9atkOEdyafEwVPq5YCdJKRN3T4pTn4N+JCSOK4eE6go1dDc9 qSrzEdK9HOOH6//n+hvGAi9osW6uxxY0wqYs6O6XF21zHc7RbZFJuLwWKZJL6w== 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 4NbXyw73RZz19RN; Mon, 19 Dec 2022 21:34:16 +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 2BJLYGQe000544; Mon, 19 Dec 2022 21:34:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJLYGgE000543; Mon, 19 Dec 2022 21:34:16 GMT (envelope-from git) Date: Mon, 19 Dec 2022 21:34:16 GMT Message-Id: <202212192134.2BJLYGgE000543@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Graham Perrin Subject: git: c35a71080172 - main - emulators/virtualbox-ose: fix builds 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: grahamperrin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c35a710801728ab8ed3b2639a9a89f890f6acc29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by grahamperrin (doc committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=c35a710801728ab8ed3b2639a9a89f890f6acc29 commit c35a710801728ab8ed3b2639a9a89f890f6acc29 Author: Mateusz Guzik AuthorDate: 2022-12-19 21:30:08 +0000 Commit: Graham Perrin CommitDate: 2022-12-19 21:30:08 +0000 emulators/virtualbox-ose: fix builds on CURRENT SAVENAME was retired by D36542 https://reviews.freebsd.org/D36542 Bug 267079 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267079 involves failures to build four ports, for VirtualBox guest additions, on FreeBSD-CURRENT: emulators/virtualbox-ose-additions emulators/virtualbox-ose-additions-legacy emulators/virtualbox-ose-additions-nox11 emulators/virtualbox-ose-additions-nox11-legacy Fix bug 267079 for CURRENT 1400068 and greater by hiding the use of SAVENAME in patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c for: emulators/virtualbox-ose emulators/virtualbox-ose-legacy PR: : 267079 Author: : mjg Approved by: : ports-committers (lwhsu), khng Differential revision: https://reviews.freebsd.org/D37074 --- .../files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 2 ++ .../files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c index a191d66946cf..dc1027d4196b 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c +++ b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c @@ -1413,9 +1413,11 @@ + if (error != 0) + goto out; + ++#if __FreeBSD_version < 1400068 + /* Keep the component name in the buffer for + * future uses. */ + cnp->cn_flags |= SAVENAME; ++#endif + + error = EJUSTRETURN; + } else diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c index a1a69874a29e..6273c7b74084 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c @@ -1413,9 +1413,11 @@ + if (error != 0) + goto out; + ++#if __FreeBSD_version < 1400068 + /* Keep the component name in the buffer for + * future uses. */ + cnp->cn_flags |= SAVENAME; ++#endif + + error = EJUSTRETURN; + } else