gentoo auto-resync : 28:01:2024 - 12:57:11

6 files changed, 60 insertions, 12 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 79ffdae4b1cf..d3f7f610e92d 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,6 +12,7 @@ AUX virtualbox-7.0.0-fix-compilation-clang.patch 1638 BLAKE2B 2c1c021a5b95ffdbd4
 AUX virtualbox-7.0.10-fix-binutils-hardened.patch 1170 BLAKE2B 1e1dfdbb9f22da1da0dacf386e95757654138653ab85a5fda3106af66484f56f0e1bd286182e66c3b32c28d7643f80f5d1063105a84cb1b502544ae7eb7e0730 SHA512 341a0966d4e884c716a8f296128bb3ef12dab91285bacd3f4a49615ea6beb9b928a33fd5eeeb2c10dac62ed6cfef8e95278b5621f6bd90dca6a30c4e6b625b02
 AUX virtualbox-7.0.10-python.patch 871 BLAKE2B 3f01becc0d369805dd373a691eafd3cd9ee40b4e8db95aa285fb07e314f1489a163c8f4e7cd494834f9adde21f80ad668a5b3f4166c67cd150ce3a029e980b0c SHA512 0ee7b8f44d8c2e1e4b35c2edbc4c5a12b9fa165133975eac83e7cbdc127d273a1f20b6720b97a33912489d5d64c41b7429bde60c01264e31a1e7995707bdbaea
 AUX virtualbox-7.0.11-configure-include-qt6-path.patch 641 BLAKE2B a66abdac95e1acfea23a1010d8ef1ecba04b2e122887dd4a298e0462d96dd3c771f529ca82c321a0677828ff4e27344adb5905686253d5689d2214301ceed6f0 SHA512 c3f468263df48b1cdbc2b80541891a18c77783a99314efb01fabf09adad2a58dc21e1d59801df2b02246cf196a798ad72139ce0b203d00e171c6611e23f0e867
+AUX virtualbox-7.0.14-libxml2-2.12.patch 1764 BLAKE2B e61bc333f69095eb3341af2f7c94b20dee7c7802077bb7dab8ed29f67ada3738e82bae40645f892eb68291886722c0f4260ac025fbee5380b4215d47f1c4b0af SHA512 d461ee61eb3c4fcff079033e5bb5a7181a627cb295927f2b302120043c16b21c962edb360e79787eaa543833c07b2d5dc1119bcc210a346dafe4cc3104f9d77c
 AUX virtualbox-7.0.6-fix-libxml2.patch 15849 BLAKE2B 2a12ab133aeed3295fd9c1281a3a2f56526468a11f2b2426d3a3f8e3d912130b3eeaa21d6c537ff916e7c91499bb97ef8c3c8e11baea2866ad35e93cc3cf636f SHA512 042a4dbee2a5b665240cdd2af4bd5d88fe0da717f562afa1c7c89df634bc0c31a7bb38c34d0b928a4d38db13693a647db61f1c5ae963172b3fb6f83bd9441d3b
 AUX virtualbox-7.0.6-gcc-13.patch 579 BLAKE2B 50d629cafe1aff45ed08d712ab730555f2093336f28be38246c54a60ccbefab880b4b5a548b45e151c583749d347a26dc43fc5fef4e8c400c7bad424c9fa366a SHA512 34b5543c62044d530ee5927b367301f39d465d6177cfa2023578ff572d8e62eef2c5a06e1ec8d274fc582c017232b3603f668a1c09ec7774620e83245cdf90ba
 AUX virtualbox-7.0.8-disable-rebuild-iPxeBiosBin.patch 843 BLAKE2B bd7fef7afc725a247e9c84999786c27398ee9bdc4dd6f62f153202ab2f281ca8fb8445aa369aa1270a00acc6ba7f709f4d7923eea1acf02779827ba9ae2c2fa9 SHA512 d79b5be03417fbbf90634da5c63ac8975a950f559e42ed97a556edce28ada4d592b1807e89145e58caea1648486916bf0b7bf96e0843bad1cc3cace9048a3a4b
@@ -29,9 +30,9 @@ DIST virtualbox-help-7.0.14.tar.xz 3944832 BLAKE2B 95079e4da8c960c41cee799142779
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.10_pre20230615.tar.bz2 2253 BLAKE2B 27b422acc2ae85c4324d6f4471db80c9f680b1c4a00223c38b9e3fb31709b05163a1bd53408cffeabdef295e856aa8b01b86e0fecf5d80ace376ea1bd4fc9504 SHA512 c2177f46048f09b6be9ac2c35b43d74f67350b052411cc64adf6c0b3d284055eef79f960f1384a3aaeee7d25f8c19ea8f936ee2623a2251d1d28f85ed3469c22
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
-EBUILD virtualbox-6.1.48-r1.ebuild 18928 BLAKE2B ded8313442339b7ac52616b141ac2df38db2e69accdc523acf9da44ebf2e7d639107d188de834afaebee273d9d2495d3f4994059ddb4f9ab94977064e5a42a9b SHA512 d423e0242c51bc874e02a1b0c787213086b408f6ff74230818e6dcc208d0c0af0f12774a59791cacc3820f984fd92e5c7c2bb0c0cdd8c6e4968ebbdd87ad6af6
-EBUILD virtualbox-6.1.50-r1.ebuild 18964 BLAKE2B ade4582bc8f273a738b17088e78e6f3eec681914fed0997c500aac8f07ebca98abfb811929774e4e0f2e3ca69eae432bd0caf38b5f80a655f0a041a86bd6a752 SHA512 4cab206225d7570bb45f2504f28ba026fc2dfa5ed408709da595c0114b94241bcb109e008c4a919fabfddcc1c2853954b75adb627b36a0205f3728621da2325e
-EBUILD virtualbox-7.0.12-r1.ebuild 21529 BLAKE2B 78e2d26b5ebe4c188992b35baeba589b143ca64ad60c4f6e3a368294ad2b7adfab37d9a4474fb4418723b237889c972ac5951d8ee7f06e20dac3c646d3d9a322 SHA512 b230606b5ce5c4cd112aed289c8a0cbacce0db563907f0e43d6d031e0d416b51c951e296a1a5ad8e16ca22332a3162e256470adff15ace1f59883f93b570d9de
-EBUILD virtualbox-7.0.14-r1.ebuild 21537 BLAKE2B 26ac764c89b4136d5fde2e75df3076d5efb1a7ba9ff0833533157b5db92fe9e0e5ba9f55edc0eaaec9b687599b1434a0e0bb7ff84ee4e62685dec693a335422b SHA512 765d9db3e96fa5057921455dc68558cbc34d852a437b952f070db42caacaa81501c39cdd0b6188286e3552c738ae9012cbdd8e19bb864718eb2b387d3769c689
+EBUILD virtualbox-6.1.48-r2.ebuild 18946 BLAKE2B aad9adbb63d7252b67c4ac441900542ab085e749c6f3159a2a4ca88b7ba22d492ca81d72dce940d3caa9db449929e377544414873a7b7029456f0ba63b085a25 SHA512 a62a6b18a51143b925ef3d8940283746ba2ddff975bec0e1335da7bc5f5bcd9b0bc4a4f30880faa3e590c0c7064fe758620f730726899d81e0a97c6c953e822e
+EBUILD virtualbox-6.1.50-r2.ebuild 18982 BLAKE2B 0290f1ebcb0f31f211b92c7e7d64a9187886ce214d7a710df4676060789ae4d9d408cd25d50c97698ad67aad4384682ae87d6b6f4076f39e4722145245ed7314 SHA512 63e87fec69f8d1ec84bfa4ddb364ea029f7950d684ddbe6d58552c0582ae5dc782c08b58126f68a96219737ef72410196434a888781d6f367209c88302f67424
+EBUILD virtualbox-7.0.12-r2.ebuild 21547 BLAKE2B b4f255b29a46452386cefb7a66ce897d9dbcfe66fe535aecd0bd5263ea066c871e554f23cff0e664e40db198727d0c25755529dfe8552b563e59c37c2a296182 SHA512 7f91171dc68fd27f6728c2ca35eea4a9c45572f0a4b0fca4f3f5b65554447663def5cdaf41feb6aaefa7b25c0f975073c92187ba6610017cb0dd7f7cd6502aba
+EBUILD virtualbox-7.0.14-r2.ebuild 21555 BLAKE2B f3f37eb31b72f4665c91c62934a71d645ad986cd7be54d41eb6097ef2d0ae1bfa8e11e1f90232d16df42eaeb0823171bd95dce3415755176eab0460f16d4448c SHA512 7c43954a0f2012173d04ff3b8b9c99b6daf42dbf50b72da344b6ea63cb0d31ce3fea2776aa23787f8b19024b8cc3bfd80ea65a47386b45298fc40e3f9059791a
 EBUILD virtualbox-9999.ebuild 22148 BLAKE2B 78ace73210ba0ee2b67a15fc6b85f0ff0bd2afcbe93dce98520be108526719449975f5522302ae020545baf8b10e0573303a83994ac525f537ac2b617cc95cc0 SHA512 522ff469d604865ca3e54a7476adcd63085a1afc91e7ed3539a1ad8c5ac4f8595d0d26b13a019eceaba8242e71dfb2ca28a5376baec0c4a63bd3580b9eb1c9fe
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.14-libxml2-2.12.patch b/app-emulation/virtualbox/files/virtualbox-7.0.14-libxml2-2.12.patch
new file mode 100644
index 000000000000..a523bad41a30
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-7.0.14-libxml2-2.12.patch
@@ -0,0 +1,43 @@
+Bug: https://bugs.gentoo.org/922445
+
+The change in libxml2 is not backwards compatibe.
+A patch like the one in arch does not work with 2.11, so just cast the argument to maintain compatibility with both.
+
+The upstream change is in include/libxml/xmlerror.h:
+
+ typedef xmlError *xmlErrorPtr;
+
+-typedef void (*xmlStructuredErrorFunc) (void *userData, xmlErrorPtr error);
++typedef void (*xmlStructuredErrorFunc) (void *userData, const xmlError *error);
+
+See also: https://gitlab.archlinux.org/archlinux/packaging/packages/virtualbox/-/blob/main/019-libxml-2-12.patch?ref_type=heads
+
+--- a/src/VBox/Runtime/r3/xml.cpp
++++ b/src/VBox/Runtime/r3/xml.cpp
+@@ -1870,7 +1870,7 @@
+         throw std::bad_alloc();
+     /* per-thread so it must be here */
+     xmlSetGenericErrorFunc(NULL, xmlParserBaseGenericError);
+-    xmlSetStructuredErrorFunc(NULL, xmlParserBaseStructuredError);
++    xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc)xmlParserBaseStructuredError);
+ }
+ 
+ XmlParserBase::~XmlParserBase()
+@@ -1931,7 +1931,7 @@
+                                                   pcszFilename,
+                                                   NULL,       // encoding = auto
+                                                   options)))
+-        throw XmlError(xmlCtxtGetLastError(m_ctxt));
++        throw XmlError((xmlErrorPtr)xmlCtxtGetLastError(m_ctxt));
+ 
+     doc.refreshInternals();
+ }
+@@ -2191,7 +2191,7 @@
+                                               pcszFilename,
+                                               NULL,       // encoding = auto
+                                               options)))
+-        throw XmlError(xmlCtxtGetLastError(m_ctxt));
++        throw XmlError((xmlErrorPtr)xmlCtxtGetLastError(m_ctxt));
+ 
+     doc.refreshInternals();
+ }
diff --git a/app-emulation/virtualbox/virtualbox-6.1.48-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.48-r2.ebuild
index 87034f0a749c..73aee19fe61f 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.48-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.48-r2.ebuild
@@ -36,14 +36,13 @@ IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudi
 
 unset WATCOM #856769
 
-# <libxml2-2.12.0: bug #922445
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	acct-group/vboxusers
 	~app-emulation/virtualbox-modules-${PV}
 	>=dev-libs/libxslt-1.1.19
 	net-misc/curl
-	<dev-libs/libxml2-2.12.0
+	dev-libs/libxml2
 	media-libs/libpng:0=
 	media-libs/libvpx:0=
 	sys-libs/zlib:=
@@ -181,6 +180,8 @@ PATCHES=(
 
 	# 906309
 	"${FILESDIR}"/${PN}-6.1.44-fix-libxml2.patch
+	# 922445
+	"${FILESDIR}"/${PN}-7.0.14-libxml2-2.12.patch
 
 	# Downloaded patchset
 	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
diff --git a/app-emulation/virtualbox/virtualbox-6.1.50-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.50-r2.ebuild
index 313402ffc61d..61d748604580 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.50-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.50-r2.ebuild
@@ -36,14 +36,13 @@ IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudi
 
 unset WATCOM #856769
 
-# <libxml2-2.12.0: bug #922445
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	acct-group/vboxusers
 	~app-emulation/virtualbox-modules-${PV}
 	>=dev-libs/libxslt-1.1.19
 	net-misc/curl
-	<dev-libs/libxml2-2.12.0
+	dev-libs/libxml2
 	media-libs/libpng:0=
 	media-libs/libvpx:0=
 	sys-libs/zlib:=
@@ -181,6 +180,8 @@ PATCHES=(
 
 	# 906309
 	"${FILESDIR}"/${PN}-6.1.44-fix-libxml2.patch
+	# 922445
+	"${FILESDIR}"/${PN}-7.0.14-libxml2-2.12.patch
 
 	# Downloaded patchset
 	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
diff --git a/app-emulation/virtualbox/virtualbox-7.0.12-r1.ebuild b/app-emulation/virtualbox/virtualbox-7.0.12-r2.ebuild
index f407a63b7d9a..2a2956c15e0b 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.12-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.12-r2.ebuild
@@ -39,13 +39,12 @@ IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl py
 
 unset WATCOM #856769
 
-# <libxml2-2.12.0: bug #922445
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	acct-group/vboxusers
 	~app-emulation/virtualbox-modules-${PV}
 	dev-libs/libtpms
-	<dev-libs/libxml2-2.12.0
+	dev-libs/libxml2
 	dev-libs/openssl:0=
 	media-libs/libpng:0=
 	media-libs/libvpx:0=
@@ -209,6 +208,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.6-fix-libxml2.patch
 	# 913109
 	"${FILESDIR}"/${PN}-7.0.10-fix-binutils-hardened.patch
+	# 922445
+	"${FILESDIR}"/${PN}-7.0.14-libxml2-2.12.patch
 
 	# Downloaded patchset
 	"${WORKDIR}"/virtualbox-patches-7.0.8/patches
diff --git a/app-emulation/virtualbox/virtualbox-7.0.14-r1.ebuild b/app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild
index 1709f2f3716f..202adf9284a7 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.14-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild
@@ -39,13 +39,12 @@ IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl py
 
 unset WATCOM #856769
 
-# <libxml2-2.12.0: bug #922445
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	acct-group/vboxusers
 	~app-emulation/virtualbox-modules-${PV}
 	dev-libs/libtpms
-	<dev-libs/libxml2-2.12.0
+	dev-libs/libxml2
 	dev-libs/openssl:0=
 	media-libs/libpng:0=
 	media-libs/libvpx:0=
@@ -209,6 +208,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.6-fix-libxml2.patch
 	# 913109
 	"${FILESDIR}"/${PN}-7.0.10-fix-binutils-hardened.patch
+	# 922445
+	"${FILESDIR}"/${PN}-7.0.14-libxml2-2.12.patch
 
 	# Downloaded patchset
 	"${WORKDIR}"/virtualbox-patches-7.0.8/patches