From bff543bb632933380da922cbfc07c67157d72d42 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Jun 2024 00:11:31 +0100 Subject: gentoo auto-resync : 23:06:2024 - 00:11:30 --- app-emulation/virtualbox-guest-additions/Manifest | 1 - ...tualbox-guest-additions-7.0.14-kernel-6.8.patch | 242 --------------------- 2 files changed, 243 deletions(-) delete mode 100644 app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.14-kernel-6.8.patch (limited to 'app-emulation/virtualbox-guest-additions') diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index b54c3017e76f..fe0efedff3e0 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -1,7 +1,6 @@ AUX vboxclient.desktop 145 BLAKE2B c01f4c307cd965d271e19f31cab5f902126bdf49bd947329c9ffad4955665b142576438dd124bc323d540cb2f6229c722b2611d4ba405521432965d9d0bddd8f SHA512 90e2ff4b8a67120f7f3c116676c7553243a1bf3c9a76f71ef471bc556c4eee55953e6a5dde952688d4892d469149db8704a921a14755eea66b1789805fe3ca42 AUX vboxguest-6.1.36-log-use-c99.patch 288 BLAKE2B 7a869ea9c46d91b64e6f062173bce10db25581b2390dad517016eb35cdae0727579e374318afdf749c3118436c667dacaf670f93698894b972b3badc60a80a43 SHA512 c66d75e77d84f081095de91248f236606b5e0bcc50a5525918fce979c97d84dddf6d10fc2a21832db74b5ef632949d9dee8ec30b4f1ab05bcec1aa75da681971 AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c03b77fb1a4df5279e38929c4e6e446387f30eef9fd8f32b9f877db1074c0e28f9a461ec3114e7120f636e02ce41a72a81b1e69c62e SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40 -AUX virtualbox-guest-additions-7.0.14-kernel-6.8.patch 9491 BLAKE2B 577b821c18ee0da7fa064d9f45c75c3d28edafef773c6a5523c5dbc129badbf29dc861a8b9a1d500e9941a06ce5fe9833cf0a29d64433e4d68a6d0416ad029e9 SHA512 ac7a1aa06765a337acc77d5312bc1b9880ed1162544fcf36043d27d8977c00f4712d1a5491b760a133a6da4e92e8f205872669a4420cda621d2ac7b412461772 AUX virtualbox-guest-additions-7.0.8-fix-gcc13.patch 753 BLAKE2B 2c42f0d370d5be3c02278389a103dec8d7ee3515b61147aaccb4b47285329fa0b87edea392031c856b14c2527544c1ddccd1a3a23522d10fb60f40f4dbdac941 SHA512 76766339012cc60a5c360caf17d92547718d67c670a498085f30b99be7541b69ed3f9acc6e7916dfb131facc4343fdd0db27b981755250189c16df215a6aee15 AUX virtualbox-guest-additions-8.initd-r1 547 BLAKE2B 1b26fc26e95baa74d551f8a9cf62f698485d63a0487c4cc4fc9906b8ced191f078e2b794ef9db9488de9e92188c73812c16e37ff542f06e0d52a4dc62b631960 SHA512 81ccc8d3edd965feb55290cf1281a97a485f14fd1de07cd59479bd7746291d41abc45c2e7e209f17f7df057528be83c48f3e270b526e6b86d85c5ec4be2d3944 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83 diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.14-kernel-6.8.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.14-kernel-6.8.patch deleted file mode 100644 index 459dbef713e9..000000000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.14-kernel-6.8.patch +++ /dev/null @@ -1,242 +0,0 @@ -Support for kernel 6.8.x. - -https://www.virtualbox.org/changeset/102989/vbox -https://www.virtualbox.org/changeset/102990/vbox -https://www.virtualbox.org/changeset/102992/vbox -https://www.virtualbox.org/changeset/102993/vbox -https://www.virtualbox.org/changeset/102994/vbox - ------------------------------------------------------------------------- -r102989 | vboxsync | 2024-01-22 19:12:25 +0200 (Lu, 22 ian 2024) | 2 lines - -iprt: Add wrapper for strlcpy/strscpy functions, bugref:10584. - - ---- a/include/iprt/string.h -+++ b/include/iprt/string.h -@@ -245,7 +245,29 @@ - # define RT_BCOPY_UNFORTIFIED(a_pDst, a_pSrc, a_cbToCopy) memcpy((a_pDst), (a_pSrc), (a_cbToCopy)) - #endif /* !RT_OS_LINUX && !__KERNEL__ */ - -+/** @def RT_STRSCPY -+ * Copy string and NULL-terminate output buffer. -+ * -+ * This macro should mostly be used in Linux kernel code. This is -+ * the replacement for deprecated strlcpy. It was deprecated since 3.16.60 -+ * when strscpy was introduced as an alternative. Finally, strlcpy was -+ * completely removed from kernel code in 6.8.0. -+ * -+ * @param a_pDst Pointer to the destination string buffer. -+ * @param a_pSrc Pointer to the source NULL-terminated string buffer. -+ * @param a_cbToCopy Size of destination buffer.. -+ */ -+#if defined(RT_OS_LINUX) && defined(__KERNEL__) -+# if (RTLNX_VER_MIN(3,16,60)) -+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy) strscpy((a_pDst), (a_pSrc), (a_cbToCopy)) -+# else /* < 3.16.60 */ -+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy) strlcpy((a_pDst), (a_pSrc), (a_cbToCopy)) -+# endif -+#else /* !RT_OS_LINUX && !__KERNEL__ */ -+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy) strscpy((a_pDst), (a_pSrc), (a_cbToCopy)) -+#endif /* !RT_OS_LINUX && !__KERNEL__ */ - -+ - #ifdef IN_RING3 - - /** - ------------------------------------------------------------------------- ------------------------------------------------------------------------- -r102990 | vboxsync | 2024-01-22 19:13:50 +0200 (Lu, 22 ian 2024) | 2 lines - -Additions: Linux: Introduce initial support for kernel 6.8, bugref:10584. - - ---- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c -+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c -@@ -1410,7 +1410,7 @@ - RTLogGroupSettings(pLogger, pszValue); - } - else if (pParam->name[0] != 'd') -- strlcpy(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp)); -+ RT_STRSCPY(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp)); - - return 0; - } -@@ -1436,7 +1436,7 @@ - RTLogFlags(pLogger, pszValue); - } - else if (pParam->name[0] != 'd') -- strlcpy(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags)); -+ RT_STRSCPY(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags)); - return 0; - } - -@@ -1461,7 +1461,7 @@ - RTLogDestinations(pLogger, pszValue); - } - else if (pParam->name[0] != 'd') -- strlcpy(&g_szLogDst[0], pszValue, sizeof(g_szLogDst)); -+ RT_STRSCPY(&g_szLogDst[0], pszValue, sizeof(g_szLogDst)); - return 0; - } - ---- a/src/VBox/Additions/linux/drm/vbox_drv.h -+++ b/src/VBox/Additions/linux/drm/vbox_drv.h -@@ -538,9 +538,7 @@ - int vbox_irq_init(struct vbox_private *vbox); - void vbox_irq_fini(struct vbox_private *vbox); - void vbox_report_hotplug(struct vbox_private *vbox); --#if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_MAJ_PREREQ(9,1) && !RTLNX_SUSE_MAJ_PREREQ(15,5) - irqreturn_t vbox_irq_handler(int irq, void *arg); --#endif - - /* vbox_hgsmi.c */ - void *hgsmi_buffer_alloc(struct gen_pool *guest_pool, size_t size, ---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c -+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c -@@ -1408,7 +1408,7 @@ - switch (opt) { - case Opt_iocharset: - case Opt_nls: -- strlcpy(info->nls_name, param->string, sizeof(info->nls_name)); -+ RT_STRSCPY(info->nls_name, param->string, sizeof(info->nls_name)); - break; - case Opt_uid: - info->uid = result.uint_32; -@@ -1469,7 +1469,7 @@ - printk(KERN_WARNING "vboxsf: cache mode (%u) is out of range, using default instead.\n", result.uint_32); - break; - case Opt_tag: -- strlcpy(info->szTag, param->string, sizeof(info->szTag)); -+ RT_STRSCPY(info->szTag, param->string, sizeof(info->szTag)); - break; - default: - return invalf(fc, "Invalid mount option: '%s'", param->key); -@@ -1528,7 +1528,7 @@ - } - - /* fc->source (the shared folder name) is set after vbsf_init_fs_ctx() */ -- strlcpy(info->name, fc->source, sizeof(info->name)); -+ RT_STRSCPY(info->name, fc->source, sizeof(info->name)); - - # if RTLNX_VER_MAX(5,3,0) - return vfs_get_super(fc, vfs_get_independent_super, vbsf_read_super_aux); ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -3505,7 +3505,7 @@ - }; - - /** file_operations::mmap wrapper for logging purposes. */ --extern int vbsf_reg_mmap(struct file *file, struct vm_area_struct *vma) -+static int vbsf_reg_mmap(struct file *file, struct vm_area_struct *vma) - { - int rc; - SFLOGFLOW(("vbsf_reg_mmap: file=%p vma=%p\n", file, vma)); -@@ -3786,7 +3786,7 @@ - } - - # if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(9,3, 9,99) --int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, -+static int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, - unsigned len, struct page **pagep, void **fsdata) - { - vbsf_write_begin_warn(pos, len, 0); -@@ -3793,7 +3793,7 @@ - return simple_write_begin(file, mapping, pos, len, pagep, fsdata); - } - # else --int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, -+static int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, - unsigned len, unsigned flags, struct page **pagep, void **fsdata) - { - vbsf_write_begin_warn(pos, len, flags); - ------------------------------------------------------------------------- ------------------------------------------------------------------------- -r102992 | vboxsync | 2024-01-22 19:33:49 +0200 (Lu, 22 ian 2024) | 5 lines - -iprt: Add wrapper for strlcpy/strscpy functions, build fix, bugref:10584. - -Ignore return code of strscpy() in RT_STRSCPY macro sinse we have no caller -who is using it. Also rename macro parameter, so it makes more sense. - - ---- a/include/iprt/string.h -+++ b/include/iprt/string.h -@@ -255,16 +255,16 @@ - * - * @param a_pDst Pointer to the destination string buffer. - * @param a_pSrc Pointer to the source NULL-terminated string buffer. -- * @param a_cbToCopy Size of destination buffer.. -+ * @param a_cbDst Size of destination buffer. - */ - #if defined(RT_OS_LINUX) && defined(__KERNEL__) - # if (RTLNX_VER_MIN(3,16,60)) --# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy) strscpy((a_pDst), (a_pSrc), (a_cbToCopy)) -+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) (void)strscpy((a_pDst), (a_pSrc), (a_cbDst)) - # else /* < 3.16.60 */ --# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy) strlcpy((a_pDst), (a_pSrc), (a_cbToCopy)) -+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) strlcpy((a_pDst), (a_pSrc), (a_cbDst)) - # endif - #else /* !RT_OS_LINUX && !__KERNEL__ */ --# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy) strscpy((a_pDst), (a_pSrc), (a_cbToCopy)) -+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) (void)strscpy((a_pDst), (a_pSrc), (a_cbDst)) - #endif /* !RT_OS_LINUX && !__KERNEL__ */ - - - ------------------------------------------------------------------------- -r102993 | vboxsync | 2024-01-22 19:41:44 +0200 (Lu, 22 ian 2024) | 5 lines - -Add wrapper for strlcpy/strscpy functions, build fix, bugref:10584. - -It seem, strscpy was added around 4.3.0. Older kernels probably -have it as a backport. So, stick to 4.3.0. - - ---- a/include/iprt/string.h -+++ b/include/iprt/string.h -@@ -258,7 +258,7 @@ - * @param a_cbDst Size of destination buffer. - */ - #if defined(RT_OS_LINUX) && defined(__KERNEL__) --# if (RTLNX_VER_MIN(3,16,60)) -+# if (RTLNX_VER_MIN(4,3,0)) - # define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) (void)strscpy((a_pDst), (a_pSrc), (a_cbDst)) - # else /* < 3.16.60 */ - # define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) strlcpy((a_pDst), (a_pSrc), (a_cbDst)) - ------------------------------------------------------------------------- -r102994 | vboxsync | 2024-01-22 20:06:29 +0200 (Lu, 22 ian 2024) | 6 lines - -iprt: Add wrapper for strlcpy/strscpy functions, build fix, bugref:10584. - -Another way around to suppress build error when strscpy return status -is not used. Also, turn macro into strlcpy for non-Linux systems, -so for them it will be no change. - - ---- a/include/iprt/string.h -+++ b/include/iprt/string.h -@@ -259,12 +259,16 @@ - */ - #if defined(RT_OS_LINUX) && defined(__KERNEL__) - # if (RTLNX_VER_MIN(4,3,0)) --# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) (void)strscpy((a_pDst), (a_pSrc), (a_cbDst)) -+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) \ -+ { \ -+ ssize_t _ret; \ -+ _ret = strscpy((a_pDst), (a_pSrc), (a_cbDst)); \ -+ } - # else /* < 3.16.60 */ - # define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) strlcpy((a_pDst), (a_pSrc), (a_cbDst)) - # endif - #else /* !RT_OS_LINUX && !__KERNEL__ */ --# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) (void)strscpy((a_pDst), (a_pSrc), (a_cbDst)) -+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) strlcpy((a_pDst), (a_pSrc), (a_cbDst)) - #endif /* !RT_OS_LINUX && !__KERNEL__ */ - - - ------------------------------------------------------------------------- -- cgit v1.2.3