commit 9af33623ddb23a3b3ddf08c75aec948a8e02f385 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Thu Jan 18 20:46:42 2024 +0000 Update VirtualBox to 7.0.14 VirtualBox.spec | 9 ++++++++- libxml-2.12.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++ sources | 4 ++-- update_vbox.sh | 2 +- 4 files changed, 58 insertions(+), 4 deletions(-) --- diff --git a/VirtualBox.spec b/VirtualBox.spec index dd743db..62ace55 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -45,7 +45,7 @@ %bcond_without python3 Name: VirtualBox -Version: 7.0.12 +Version: 7.0.14 Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -82,6 +82,7 @@ Patch3: VirtualBox-7.0.2-default-to-Fedora.patch Patch4: VirtualBox-5.1.0-lib64-VBox.sh.patch #Patch27: VirtualBox-gcc.patch Patch28: virtualbox-gcc13_cstdint.patch +Patch30: libxml-2.12.patch #to revert on EL7 Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch @@ -344,6 +345,9 @@ rm -r src/libs/libtpms-0.9.*/ %if 0%{?rhel} && 0%{?rhel} < 8 %patch -P 29 -p2 -R -b .gsoap3 %endif +%if 0%{?fedora} > 39 +%patch -P 30 -p1 -b .libxml +%endif %if %{with python3} %patch -P 40 -p1 -b .python2_path %endif @@ -900,6 +904,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Wed Jan 17 2024 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.14-1 +- Update VirtualBox to 7.0.14 + * Tue Oct 17 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.12-1 - Update VirtualBox to 7.0.12 diff --git a/libxml-2.12.patch b/libxml-2.12.patch new file mode 100644 index 0000000..4631f30 --- /dev/null +++ b/libxml-2.12.patch @@ -0,0 +1,47 @@ +diff --git a/include/iprt/cpp/xml.h b/include/iprt/cpp/xml.h +index 40975e86..7639c281 100644 +--- a/include/iprt/cpp/xml.h ++++ b/include/iprt/cpp/xml.h +@@ -113,9 +113,9 @@ public: + class RT_DECL_CLASS XmlError : public RuntimeError + { + public: +- XmlError(xmlErrorPtr aErr); ++ XmlError(const xmlError *aErr); + +- static char* Format(xmlErrorPtr aErr); ++ static char* Format(const xmlError *aErr); + }; + + // Logical errors +diff --git a/src/VBox/Runtime/r3/xml.cpp b/src/VBox/Runtime/r3/xml.cpp +index a6661760..b301a6c6 100644 +--- a/src/VBox/Runtime/r3/xml.cpp ++++ b/src/VBox/Runtime/r3/xml.cpp +@@ -131,7 +131,7 @@ LogicError::LogicError(RT_SRC_POS_DECL) + RTStrFree(msg); + } + +-XmlError::XmlError(xmlErrorPtr aErr) ++XmlError::XmlError(const xmlError *aErr) + { + if (!aErr) + throw EInvalidArg(RT_SRC_POS); +@@ -145,7 +145,7 @@ XmlError::XmlError(xmlErrorPtr aErr) + * Composes a single message for the given error. The caller must free the + * returned string using RTStrFree() when no more necessary. + */ +-/* static */ char *XmlError::Format(xmlErrorPtr aErr) ++/* static */ char *XmlError::Format(const xmlError *aErr) + { + const char *msg = aErr->message ? aErr->message : "<none>"; + size_t msgLen = strlen(msg); +@@ -1856,7 +1856,7 @@ static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...) RT_NO + va_end(args); + } + +-static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) RT_NOTHROW_DEF ++static void xmlParserBaseStructuredError(void *pCtx, const xmlError *error) RT_NOTHROW_DEF + { + NOREF(pCtx); + /* we expect that there is always a trailing NL */ diff --git a/sources b/sources index 2bd2779..3599e85 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VirtualBox-7.0.12.tar.bz2) = 9fe4511442eba788d02f932f5e98cfcc5aa4ebed41c00bd7333cf7e3f5de787e458f1f56930978283f041f403652c803143335fe9120ab63a2c113ca7b3f588f -SHA512 (UserManual.pdf) = 8f5dc56d8ca055a79b80785abf91a9aa44338240c5839ff3a362711aa513f315c4b4e8e0f25a2a71274b335a03a264feca1c7d0b1751188d212c4e76ffea1233 +SHA512 (VirtualBox-7.0.14.tar.bz2) = 6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73 +SHA512 (UserManual.pdf) = e7f8eadb443d76a5906861c89e4a6a70f8461ba4bec1390601a76f20abccbf578c74bd6f1cb685e79b7f394e316dc79fd6d23613404a618aee296202dab4a4be diff --git a/update_vbox.sh b/update_vbox.sh index 90aa7f4..7adeb08 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,4 +1,4 @@ -VERSION=7.0.12 +VERSION=7.0.14 REL=1 RAWHIDE=40 REPOS="f39 f38 f37 el9 el8"