From c35a710801728ab8ed3b2639a9a89f890f6acc29 Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Mon, 19 Dec 2022 21:30:08 +0000 Subject: [PATCH] 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 --- .../patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 2 ++ .../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 a191d66946cf8..dc1027d4196bb 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 a1a69874a29e9..6273c7b740846 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