gentoo resync : 28.04.2021

3 files changed, 53 insertions, 16 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 43bf6a60d6a3..b925bb2bf78b 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -5,11 +5,12 @@ AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6
 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
+AUX virtualbox-6.1.20-lsilogicsas_crash_fix.patch 1941 BLAKE2B 05bff13ff8f9ef08bf8a9cc2c051ad89c507aa770172c6ffd5247723e28adb0e8683fde123613b6c7703f299d41636c81f8ad9b499069cbb22c424fb6e8bdff4 SHA512 ffb4648b36afcc251be9c944911660769d266ea83be8de2ceac9462af13d10689987a2a30de15407414856775ad3eb5226f39c2c598b61568b2e40ed80b8c2a0
 AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421
 DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c
+DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d SHA512 b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-6.1.16-r1.ebuild 14557 BLAKE2B 0e02fb478f8284108c737e5c2cb8ae3319fe2d5ff8f0729a1c1e71b8a44bc47471a446191afa233d912fc71e7a0b8c3adfea8dc8644ad781d5b9fd41ab77d483 SHA512 19e2b276d6f7aa731a9f0130ae68f853bf90de6e347ad76692b083980bcac7e41fa89ddbe63a0ca3739b1a757e34f01eaf9e66cbe5a710a8aa423d6522c565b3
 EBUILD virtualbox-6.1.18.ebuild 14557 BLAKE2B 0e02fb478f8284108c737e5c2cb8ae3319fe2d5ff8f0729a1c1e71b8a44bc47471a446191afa233d912fc71e7a0b8c3adfea8dc8644ad781d5b9fd41ab77d483 SHA512 19e2b276d6f7aa731a9f0130ae68f853bf90de6e347ad76692b083980bcac7e41fa89ddbe63a0ca3739b1a757e34f01eaf9e66cbe5a710a8aa423d6522c565b3
+EBUILD virtualbox-6.1.20-r1.ebuild 14483 BLAKE2B bb2f3cb2db2bdf4b7c70d2c383f814e54741b52ef0472bda903f44400c5d2cbd78732c50a8fd61b9b109fd474245c4b43cac92a64c624e75003436b24d7c69ae SHA512 27464e024724032f0afec7f2473d775d95b4707a43a5a62ded166d308e997c7c471e901019150de0918838c89123f4a0104ce45d1c63b81184cc987ba453cc2d
 MISC metadata.xml 773 BLAKE2B dade5d0d6cb8e4d8f92b865368af2e577d26e883b53e4d2274fb2b59e2ea92bdc8ee0af6a4cbca64384f9820779e44397825b3f1707d87631f1202bdc7164dac SHA512 c4718b4455eecd2669d47881af12257c1187c5f4aa3dd2fca8745df565f55a7b0e018da4ad3c5f38bd03b510bdfaaefa8a235d09fae3d8a99a55f263c995c74d
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch b/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch
new file mode 100644
index 000000000000..7f1e4b179838
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch
@@ -0,0 +1,41 @@
+Index: /trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

+===================================================================

+--- trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp	(revision 88530)

++++ trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp	(revision 88643)

+@@ -3678,8 +3678,6 @@

+     LogFlowFunc(("pThis=%#p\n", pThis));

+ 

+-    /* Clear everything first. */

+     AssertPtrReturnVoid(pThisCC->pConfigurationPages);

+     PMptConfigurationPagesSupported pPages = pThisCC->pConfigurationPages;

+-    memset(pPages, 0, sizeof(MptConfigurationPagesSupported));

+ 

+     /* Manufacturing Page 0. */

+Index: /trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h

+===================================================================

+--- trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h	(revision 82968)

++++ trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h	(revision 88643)

+@@ -3327,13 +3327,17 @@

+ 

+ #define MPT_CONFIG_PAGE_HEADER_INIT_MANUFACTURING(pg, type, nr, flags) \

++    RT_ZERO(*pg); \

+     MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_MANUFACTURING)

+ 

+ #define MPT_CONFIG_PAGE_HEADER_INIT_IO_UNIT(pg, type, nr, flags) \

++    RT_ZERO(*pg); \

+     MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IO_UNIT)

+ 

+ #define MPT_CONFIG_PAGE_HEADER_INIT_IOC(pg, type, nr, flags) \

++    RT_ZERO(*pg); \

+     MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IOC)

+ 

+ #define MPT_CONFIG_PAGE_HEADER_INIT_BIOS(pg, type, nr, flags) \

++    RT_ZERO(*pg); \

+     MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_BIOS)

+ 

+@@ -3342,4 +3346,5 @@

+  */

+ #define MPT_CONFIG_EXTENDED_PAGE_HEADER_INIT(pg, cb, nr, flags, exttype) \

++    RT_BZERO(pg, cb); \

+     (pg)->u.fields.ExtHeader.u8PageType   = (flags) | MPT_CONFIGURATION_PAGE_TYPE_EXTENDED; \

+     (pg)->u.fields.ExtHeader.u8PageNumber = (nr); \

diff --git a/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
index f6f373e8a649..95da7ce00ed7 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
 
 MY_PN="VirtualBox"
@@ -20,7 +20,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
@@ -91,7 +91,7 @@ BDEPEND="
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-fontsextra
 	)
-	java? ( >=virtual/jdk-1.6 )
+	java? ( >=virtual/jdk-1.8 )
 "
 RDEPEND="
 	${CDEPEND}
@@ -139,6 +139,10 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-lsilogicsas_crash_fix.patch"
+)
+
 pkg_pretend() {
 	if ! use headless && ! use qt5 ; then
 		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
@@ -189,7 +193,7 @@ src_prepare() {
 
 	# Use PAM only when pam USE flag is enbaled (bug #376531)
 	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
 		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
 		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
 			src/VBox/HostServices/Makefile.kmk || die
@@ -214,7 +218,7 @@ src_prepare() {
 
 	eapply "${WORKDIR}/patches"
 
-	eapply_user
+	default
 }
 
 doecho() {
@@ -414,7 +418,6 @@ src_install() {
 	fi
 
 	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
 		local udevdir="$(get_udevdir)"
 		insinto ${udevdir}
 		doins VBoxCreateUSBNode.sh
@@ -461,10 +464,6 @@ src_install() {
 	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 
@@ -506,7 +505,3 @@ pkg_postinst() {
 		elog "or else USB in ${PN} won't work."
 	fi
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}