summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2022-12-19 21:30:08 +0000
committerGraham Perrin <grahamperrin@FreeBSD.org>2022-12-19 21:30:08 +0000
commitc35a710801728ab8ed3b2639a9a89f890f6acc29 (patch)
tree0e9d0b1999b45c18c8ef96906077fbc971aa00b3
parenteditors/cudatext: Update to 1.179.0 (diff)
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
-rw-r--r--emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c2
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c2
2 files changed, 4 insertions, 0 deletions
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