gentoo auto-resync : 10:08:2024 - 11:05:14

4 files changed, 87 insertions, 0 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 69f948578d47..7c0f369c25c7 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index c49ecd143a31..45b51dc79026 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,10 +1,12 @@
 AUX virtualbox-modules-7.0.14-kernel-6.6-warning.patch 1110 BLAKE2B c66ec49874e6778d7b74bced6469ff255cd9bdf566f2180095fbb98e6cce1cb0698b4d89eba1702c3fcee7bb0f666cabd190f6b4f555cce931a2623d1e50adce SHA512 a902813dfcad7e8aabcd85164dc553f13b60c8e9cd70e45d61465ebaff26fc43811918f65f21828f41f5e30f40044003851024db32e645ac85352148ce0375c2
+AUX virtualbox-modules-7.0.14-kernel-6.9.patch 2045 BLAKE2B b4d592b81b7e763d9924bbb763426238350cd5ad4a2548ec6492d554ba11a48e9e416e96985418908299498dea87d0e29111896288ec5372c4840bfd53054f32 SHA512 bd98fdb3eea182d40264acae705faabc47260901544134a35c6fd0439d85b42966f585187b9c1a19de55f5f66b896bad96a3b0752449f25629fcfbd846f42b3d
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-6.1.50.tar.xz 680700 BLAKE2B c3a10ce8f3eb7e6c0c05f81cd3c072296557b9f9f6f501bb0aec3f04aabfe1fbb67b553510104139cef290c09ff9e67161085781b8d28c968dfafd15958a1b1a SHA512 7822e421b595263cbdaae08103255742360ca7ab0c385818ec895f10570c5b9ed5c7614742d8fa8bc2414cd426907cd1c49d735cde8caf9d2b7692898058f592
 DIST vbox-kernel-module-src-7.0.18.tar.xz 719604 BLAKE2B 44e9d895791a7ff50681dd8860456a87078b41a4eb3005a6b249f9b34c37de709e190cbd6f352d21010ddcb9d8d1c35303bafd765e999664288df9e0ead94e6c SHA512 1cc17e302ef8251abd08a078abf11fede242154b0bb78d03f8d7c2821ba7cff410bd255802316a2f13100884b35a6f14fdf0b594304bd041521b66d264f51b77
 DIST vbox-kernel-module-src-7.0.20.tar.xz 720160 BLAKE2B 833aa87af13a6c3e9426bd00e32b14c8b3958ab14425e8c02141d8579e987255b170662e00abb92f17234d4f03462d6d5b9fc1279d9da5449d344a328c905c8f SHA512 650bb6cf16ae42774524bf2e7ad2ee125d7a8d57de1e58d24b8b49bb9cf2829ea01dd32d2c1e0b2df556eab4a458cb0d84715b92d4085d03891f62a46aaf2916
 DIST vbox-kernel-module-src-7.1.0_beta1.tar.xz 738208 BLAKE2B 86a1edbfdf5505ccda2f8c3024570b7797e0d81b3c9ce7f9c3c3bf33d997558f93a660d20e29dc9da3ad0d9ae81300132f702d76756b9967c9d8d2e5b2947f67 SHA512 6b3ecbcc2a57d8292df6c4d880ebd9378245ff2eda1e623e7efefe9d99badce93a9ad5416c24a7e25ba0a81c8965407abb946cd858b9641db4e0945f4cc66c7a
 EBUILD virtualbox-modules-6.1.50-r1.ebuild 1007 BLAKE2B 35da91688a97c03ca0ac189e152e3e86d7ee2b17f48028da50e19b8ed755c6c555ebc32f2d86941a8da4409fde376a3b7db84c3b53bdb069e434502f27cce09e SHA512 0966575ad55dce2ffe6408504fe234d86d586b348ff5279655805a7ceda7af4b5ef9ec213f100c188216fb11c9f1ed2426d396054a02937900825de407a0ce4c
+EBUILD virtualbox-modules-6.1.50-r2.ebuild 1053 BLAKE2B 998ce028d1f4af7f3bb2c1e0367e4efc26f2f8ceaf54964eb6b72c58ef9d13f5ef21e7209fd8193b50e04c00350c2ab4110190968e20cc7bfda85dd401da0926 SHA512 6c9a18cf61db8f20dfc0d5c659f2df9d049cb2367cd30dead0634a66fcd21b67ac81cda3918c1bf400bdfef362d9e7f4686993d4681535873c958c987602a5a5
 EBUILD virtualbox-modules-7.0.18.ebuild 941 BLAKE2B 23539d6f2c798b730f2f9afb007158672cabb6e199356b104c5e34b4f8e819e55f77ae1f303d655333cbc4351b67dc44735c131d59bb04031bc7c1b900d49c7b SHA512 379c3e216af76612970ca077c29a3c750de40c9a91dd288754cf55e7612e64227c261ffe2b0ccb8aef21f47ed1afac713295d6f7b063f27fa083715d311f7c75
 EBUILD virtualbox-modules-7.0.20.ebuild 942 BLAKE2B eefe2ce819d229a06584224a5f4ffe531e821df6dcc7b5f761d88605ab854880f9182a22d228953e2194d9a37191e6816fb5db4f87e3e10d324a42f71486ffce SHA512 181fece45985e074c73476473eba544a69151e6e2499e6162ca6019213aff95d6460d240890b01e24ff230eb87070d31f2ab9e595a21545a3020e9f4b1e7da34
 EBUILD virtualbox-modules-7.1.0_beta1.ebuild 959 BLAKE2B 97fcedb554d6384153a3514bef315f23cd7c03575e230264197cdb9ec3fcfd280566bb44269a0d5912873282aec70dd6ff180dd72f448093621231c842d24563 SHA512 47de32670a526e4a9af4c4c470535a7d94a5b3fde57ef9f9f9aded403c5dd54223e5580ca4050ee1e1e2f33b3cf4b353f44dedb1408ea3cab57dad0c0a389d3c
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.9.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.9.patch
new file mode 100644
index 000000000000..2b2928303c91
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.9.patch
@@ -0,0 +1,46 @@
+https://www.virtualbox.org/ticket/22033
+https://bugs.gentoo.org/937445
+
+--- a/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
++++ b/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
+@@ -114,6 +114,14 @@
+ # define LNX_MM_UP_WRITE(a_pMm)       up_write(&(a_pMm)->mmap_sem)
+ #endif
+ 
++/*
++ * p.._large alias for p.._leaf is gone in 6.9
++ */
++#if RTLNX_VER_MIN(6,9,0)
++# define p4d_large p4d_leaf
++# define pmd_large pmd_leaf
++# define pud_large pud_leaf
++#endif
+ 
+ /*********************************************************************************************************************************
+ *   Structures and Typedefs                                                                                                      *
+--- a/vboxnetflt/linux/VBoxNetFlt-linux.c
++++ b/vboxnetflt/linux/VBoxNetFlt-linux.c
+@@ -926,7 +926,10 @@ static void vboxNetFltLinuxSkBufToSG(PVB
+     for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++)
+     {
+         skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];
+-# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
++# if RTLNX_VER_MIN(6,9,0)
++        pSG->aSegs[iSeg].cb = pFrag->len;
++        pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->offset;
++# elif RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
+         pSG->aSegs[iSeg].cb = pFrag->bv_len;
+         pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
+ # else /* < KERNEL_VERSION(5, 4, 0) */
+@@ -947,7 +950,10 @@ static void vboxNetFltLinuxSkBufToSG(PVB
+         for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++)
+         {
+             skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];
+-# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
++# if RTLNX_VER_MIN(6,9,0)
++            pSG->aSegs[iSeg].cb = pFrag->len;
++            pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->offset;
++# elif RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
+             pSG->aSegs[iSeg].cb = pFrag->bv_len;
+             pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
+ # else /* < KERNEL_VERSION(5, 4, 0) */
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r2.ebuild
new file mode 100644
index 000000000000..0f8363855a0e
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
+
+EAPI=8
+
+inherit linux-mod-r1
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="~!SPINLOCK JUMP_LABEL"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.14-kernel-6.6-warning.patch
+	"${FILESDIR}"/${PN}-7.0.14-kernel-6.9.patch
+)
+
+src_compile() {
+	local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc )
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}