From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C6D41382C5 for ; Thu, 22 Apr 2021 16:55:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A342E08F1; Thu, 22 Apr 2021 16:55:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23BB7E08F1 for ; Thu, 22 Apr 2021 16:55:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5CF4340F8C for ; Thu, 22 Apr 2021 16:55:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 83B82647 for ; Thu, 22 Apr 2021 16:55:17 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1619110498.e413567e5b45bde18607c150e5ba1ad4c9f38cc5.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild app-emulation/virtualbox/virtualbox-6.1.20.ebuild X-VCS-Directories: app-emulation/virtualbox/ app-emulation/virtualbox/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e413567e5b45bde18607c150e5ba1ad4c9f38cc5 X-VCS-Branch: master Date: Thu, 22 Apr 2021 16:55:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ff0c5759-6e55-4cbe-ae17-ece147c341c4 X-Archives-Hash: 7bf16cb5fbc9b5b68be92eb4fbc6089e commit: e413567e5b45bde18607c150e5ba1ad4c9f38cc5 Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 22 16:05:20 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 22 16:54:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e413567e app-emulation/virtualbox: Revbump to fix LsiLogicSAS storage controller Signed-off-by: Lars Wendler gentoo.org> .../virtualbox-6.1.20-lsilogicsas_crash_fix.patch | 41 ++++++++++++++++++++++ ...x-6.1.20.ebuild => virtualbox-6.1.20-r1.ebuild} | 6 +++- 2 files changed, 46 insertions(+), 1 deletion(-) 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 00000000000..7f1e4b17983 --- /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.20.ebuild b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild similarity index 99% rename from app-emulation/virtualbox/virtualbox-6.1.20.ebuild rename to app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild index 6af250ffce5..95da7ce00ed 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.20.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild @@ -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." @@ -214,7 +218,7 @@ src_prepare() { eapply "${WORKDIR}/patches" - eapply_user + default } doecho() {