summaryrefslogtreecommitdiff
path: root/app-emulation
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-10-31 21:49:19 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-10-31 21:49:19 +0000
commitb43ae231a57eccda208f33c4343d956e7f2590f5 (patch)
tree8871b66b51dfb514ef803c4eaf3d1f2cb57c4ee1 /app-emulation
parent7e84f2c47ae7a0e8b76fc3080b1c7ee8487ee76b (diff)
gentoo auto-resync : 31:10:2023 - 21:49:19
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/Manifest.gzbin15151 -> 15149 bytes
-rw-r--r--app-emulation/libvirt/Manifest13
-rw-r--r--app-emulation/libvirt/files/libvirt-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch57
-rw-r--r--app-emulation/libvirt/libvirt-9.3.0-r1.ebuild (renamed from app-emulation/libvirt/libvirt-9.3.0.ebuild)3
-rw-r--r--app-emulation/libvirt/libvirt-9.4.0-r4.ebuild (renamed from app-emulation/libvirt/libvirt-9.4.0-r3.ebuild)3
-rw-r--r--app-emulation/libvirt/libvirt-9.5.0-r1.ebuild (renamed from app-emulation/libvirt/libvirt-9.5.0.ebuild)3
-rw-r--r--app-emulation/libvirt/libvirt-9.6.0.ebuild2
-rw-r--r--app-emulation/libvirt/libvirt-9.8.0.ebuild4
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild2
9 files changed, 74 insertions, 13 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1bc0420768b2..b436aa57bb82 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
Binary files differ
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index c556418f4867..0fab60458475 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -6,6 +6,7 @@ AUX libvirt-9.4.0-do-not-use-sysconfig.patch 8195 BLAKE2B b731d57dc86fe725d3cbd4
AUX libvirt-9.4.0-fix-paths-for-apparmor.patch 3891 BLAKE2B 2af9198b4dbf1a05fb3d187920f3f47f773f94679bb94cdf318f092ea2ad4e6e6f88c7e2d3432e90510c6cb685de3c91721b8aa77809372dfd0c3b5d4f42ed70 SHA512 d785e5be0042072eeb4cccaf7cdf0cbe4fc195837f7736eae2da7c9d54a3f2538c2a6aac917d6f9621f66b5c05666ef8800bf30869a777bfb033a73b78129880
AUX libvirt-9.4.0-fix_paths_in_libvirt-guests_sh.patch 988 BLAKE2B 5936eafa5c300edad7ed368ec13063d31aea59e3daefeac59cf515ea44667f61aa63b0e2c2a5c88ace24c48cc132789cc5fa1a7c6c04c17e9ac61b114778e46d SHA512 5b80a5ec2898c1c821d0d49b9de67a256f82cb60879215ddde07c2a51f2e8a8b6893fec65617c27edec50cd51a362fb1fcdd21827e8de954f26879adcfa12418
AUX libvirt-9.6.0-fix-paths-for-apparmor.patch 4250 BLAKE2B bf7cc5250575a3b377539aabae316b91a4ff4bc1490f894859e7c066285909b26904fc020cf1c25bed6bae0670db52b2064b55e12a9a8161e2eb4dd0e4bd987e SHA512 abd6472a2a2bd23c0d7232ee807e4c57a799afab13c7bf11538f9b20da584677830691f84816d2cdcec0b7986817c8d469ca169073c2cb0e4b32e8b0ffa05003
+AUX libvirt-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch 2014 BLAKE2B f8ba899f0f7bf7e6a965ede4cd005cb88f45dae89cc45d392ec4771a9b74d87f8f9d46ce96259eacf6688aca38bad59c992c6fa1276441932ef7361787e85b48 SHA512 0ed84dd97965a8c6815173710ee4b157bd003c30bc1cedcafe67f534156d47a234556a2d6014181db204ee8169bfd555fc0de01651156585fdfd08aca9bb1796
AUX libvirt-9.9.0-do-not-use-sysconfig.patch 2910 BLAKE2B 60d9cd53be99377b1f51f01eca85815cbdcb3a97cbcd4131931a975d4ec8073c3a384e9a67267580d30f3ab7117a2fe83ee91c406139ef4bc25ee76e6752d884 SHA512 3ef1c6eb803e0c2425f81a9c90dd0afc466b2474e62fd8189d029bddc679ef1cf9715bf23d98bff6e3ec1ab2515a0a5ede5ffd95f15cef56f3069283ccc8e741
AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0
@@ -24,10 +25,10 @@ DIST libvirt-9.6.0.tar.xz 9282400 BLAKE2B a58f2dea7a3051bb7a69678bd1e1dac9123892
DIST libvirt-9.6.0.tar.xz.asc 833 BLAKE2B c8eb984dfb797dad5c09a1aea28b835f43f14ee560548df5d3514efab14b0c4df37c964caa6ec092751a804f998d48b89cdddb03172a6d19de82b649774212b5 SHA512 8f1cb80ecddeaed137c2a381be9c324a08aa661d629c56667ef0080b140000f288ce33491c3ebdd286f490b6935ce460cb4dd7b5ec694f4636d6fff2d621ca88
DIST libvirt-9.8.0.tar.xz 9307064 BLAKE2B aae47e8d4eeaf97532a0356de23ed5a9eea71b369d025eda95b5fd74576779eb4b843d05df6c87b79a14f218c341953749e319ee7244846a2db410a74a746880 SHA512 0118725073de33eec3fa3e4616d3154707f9828fdb9ec973f503fe68f18eab72b9704da660f281152630ddc95e605c786673af9d23dc9bdfc0108422e0efbd41
DIST libvirt-9.8.0.tar.xz.asc 833 BLAKE2B 3ecd0a925992eeadd50675f7ad8e815bde532c0f66e331ea766fff8e613b6a60b002bedee82fd03684e703057bc13d4e92191268dcd5efe2611ce9bd3cf6b505 SHA512 e041db13281eae9323c22189b7a258caf8d0e2a350cbd31b6cbed7054ccaf09d05c155c3c09daea07940affdf15e8d42bb2339945480cd141a6e8cb417a78536
-EBUILD libvirt-9.3.0.ebuild 9338 BLAKE2B 199fe95d127cff893f2134bcf6cb5bc6226b505e576959f7495ffa6781cc4732128448f77d90356ad6de2527a2d94e2a0d32ae9ca6ecf394604980c7d982bf34 SHA512 0557c857c21bdd7237ce6dc6b13f229aa3528061bde1756ac401e3f2fb296c79d7570aaec8572b1b6e61e2aaa0134a0f823437dd05d5de0cb9f34649865f0e09
-EBUILD libvirt-9.4.0-r3.ebuild 9397 BLAKE2B 365cd91248ab82a3fe5212055f7338f1be74942fefcb3a81a3e6562799c9e4099f94e7742b02884e1c24288ac42b4a2586e367ad23af4d078ef8c921e605d5f7 SHA512 d054d36408711f80a6d3bfba55edb3337e796cbe3998ce87f4716ce87368c6888d7bee412863687394b47578a1ca6ea8631e42e0bbe4a38bd5b926507615c58c
-EBUILD libvirt-9.5.0.ebuild 9400 BLAKE2B 27447d18b321a9d69a4a8d4d9baf827ac5544866a10420720d26da870c3751e522fecc0e065280b41b8633db0fc9797e9a137fe5dab90cc5af5f2ff130a3ef71 SHA512 51f89121a3757f3c38ab8538c19186de9e204a37e2554d196d0bb32f8d03b7e4d987a52e2bedb78d80b5f132022e81d6e7572e173da1946bd79435de18ef3007
-EBUILD libvirt-9.6.0.ebuild 9400 BLAKE2B 9b0ed520dd0ece1a4643c7bd21299544efb7e36e20939150abc674e45968e0402f270bcf5cbd001ae4cd77523fda000939bc536ab5b68768452b22bfa05e4039 SHA512 2aa1a8383d8a88bfc6496478c585069994cf82635f6d164bc8ce72012db26f91b4f9bb855212ab3a03ddde92419fbbb7e9b7814179876d544351dcb0bb6d07ae
-EBUILD libvirt-9.8.0.ebuild 9400 BLAKE2B 9b0ed520dd0ece1a4643c7bd21299544efb7e36e20939150abc674e45968e0402f270bcf5cbd001ae4cd77523fda000939bc536ab5b68768452b22bfa05e4039 SHA512 2aa1a8383d8a88bfc6496478c585069994cf82635f6d164bc8ce72012db26f91b4f9bb855212ab3a03ddde92419fbbb7e9b7814179876d544351dcb0bb6d07ae
-EBUILD libvirt-9999.ebuild 9400 BLAKE2B 7a6a08cd9e549b8d5dac4e96f95c1454c63c5cbd4cd7ce12681172c748e9e93928700d679444300a15f7e181d73f92f7cbb4c2c5aa7176ce78247626a1053e9c SHA512 1f7d812b8e4e9551de0f26f71eec85a689f19bf8478f00534487d21135b7e9ac407a924ab2425c44f7b76a61ad7f8e20df66945e30bd4d6de30a1d762554c53c
+EBUILD libvirt-9.3.0-r1.ebuild 9414 BLAKE2B 1370f5c9b89cc844011ad786eb731d4684ce6fecd042946b2e72f86f8951f73ca80d0b04a91188aa9a2ff9456cd0dbc8f8c478c6550df52a108f58b7674171a3 SHA512 b905a2fbc559d71c3222db84d5ab33eb5166adf6122a5f659f5f1893df303d00b86b8908eae1d625ebc44e3a3fd11bb30d245aae4fb2bc409c7c21efc15ca2f1
+EBUILD libvirt-9.4.0-r4.ebuild 9473 BLAKE2B 83327c3b9e325f3790732a32421a0c0b7fb1ba4f57cf256402df8b921ba6c5a37b7da573b7e431a7916da73f1c66ffaab0fd2cca898188eb69aa1d2a6b478f06 SHA512 252ce3384ef3988cadef3b2d78200cb7300edaa11bdfb325fd94260c74e7066f170d9c997400f2d7fcd8f43644a6c4099e6b0f2c54af442305232ba5c854f1c5
+EBUILD libvirt-9.5.0-r1.ebuild 9476 BLAKE2B 97c2647446979c6548747a6a63ced954f77333c34f0c30fbae00a9f5c604315c0ade9f89ca644c0c2196ff1ede44be0f61821644b935899b1f6eea53e864d656 SHA512 1a78bcac46f90b232f0c18bed41c3ea95f236d54e46f2635f3f4fd211d53ca97677573feb7345c8d788f323b3e29c9910247b4592f37b5de44f77f02a325bbc9
+EBUILD libvirt-9.6.0.ebuild 9390 BLAKE2B 8d17753da87e6c360d76f6ed9d7a758f224d203a2e9165f5904cc68870b74c20850f79df19386767942b1f6bd9174882cd71d2d6ff5bdbdc44a4e6d3ceea9ffe SHA512 fd722e1ff677891981c4345a15c66e197ed934b3b83f61ed329395578240bf9a9933bd06b90f5a62dba7dc48e8ee9314a90ac3fdfc9c4af0619c84c9509b8559
+EBUILD libvirt-9.8.0.ebuild 9389 BLAKE2B c065772cb7183c36ef9244a6a83161ae9c047173094e21065326da9f33c30598d25c7e955e60a282eb2d78e48f0dce79b7a2edef274854b6056be0b6ce136bb2 SHA512 be51a1a5b46b29187beb85b4fda4a418b2135cc29ec16fde0d601ee861ea59f376cfbd97c1c460c6192bc702a29f5dabd824d2135a8345c70c8b03f9149d5278
+EBUILD libvirt-9999.ebuild 9390 BLAKE2B 47897d5877dff707d0bead536106a4c18781016f904a7db5d3d0789a06fc270a8a36194b428c517982206712ba0e8ab3183120a476e480bfadc9a786b67cb969 SHA512 75805b018db10eb56f3afa847fdfdeaa447900fa1cc66998fab6836d179336b6c3da0e86cd22169ec075982a2ce3b6379da04eb69af3d558d525d442b2eec5c5
MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1
diff --git a/app-emulation/libvirt/files/libvirt-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch b/app-emulation/libvirt/files/libvirt-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch
new file mode 100644
index 000000000000..b2e1b3536227
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch
@@ -0,0 +1,57 @@
+From 9a47442366fcf8a7b6d7422016d7bbb6764a1098 Mon Sep 17 00:00:00 2001
+Message-ID: <9a47442366fcf8a7b6d7422016d7bbb6764a1098.1698742017.git.mprivozn@redhat.com>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 13 Jul 2023 16:16:37 +0200
+Subject: [PATCH] storage: Fix returning of locked objects from
+ 'virStoragePoolObjListSearch'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CVE-2023-3750
+
+'virStoragePoolObjListSearch' explicitly documents that it's returning
+a pointer to a locked and ref'd pool that maches the lookup function.
+
+This was not the case as in commit 0c4b391e2a9 (released in
+libvirt-8.3.0) the code was accidentally converted to use 'VIR_LOCK_GUARD'
+which auto-unlocked it when leaving the scope, even when the code was
+originally "leaking" the lock.
+
+Revert the corresponding conversion and add a comment that this function
+is intentionally leaking a locked object.
+
+Fixes: 0c4b391e2a9
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2221851
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/virstorageobj.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
+index 7010e97d61..59fa5da372 100644
+--- a/src/conf/virstorageobj.c
++++ b/src/conf/virstorageobj.c
+@@ -454,11 +454,16 @@ virStoragePoolObjListSearchCb(const void *payload,
+ virStoragePoolObj *obj = (virStoragePoolObj *) payload;
+ struct _virStoragePoolObjListSearchData *data =
+ (struct _virStoragePoolObjListSearchData *)opaque;
+- VIR_LOCK_GUARD lock = virObjectLockGuard(obj);
+
++ virObjectLock(obj);
++
++ /* If we find the matching pool object we must return while the object is
++ * locked as the caller wants to return a locked object. */
+ if (data->searcher(obj, data->opaque))
+ return 1;
+
++ virObjectUnlock(obj);
++
+ return 0;
+ }
+
+--
+2.41.0
+
diff --git a/app-emulation/libvirt/libvirt-9.3.0.ebuild b/app-emulation/libvirt/libvirt-9.3.0-r1.ebuild
index 35e25c535b20..d6df504de5a0 100644
--- a/app-emulation/libvirt/libvirt-9.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-9.3.0-r1.ebuild
@@ -11,7 +11,7 @@ EAPI=8
# Please bump them together!
PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
if [[ ${PV} = *9999* ]]; then
@@ -145,6 +145,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
+ "${FILESDIR}"/${PN}-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch
)
pkg_setup() {
diff --git a/app-emulation/libvirt/libvirt-9.4.0-r3.ebuild b/app-emulation/libvirt/libvirt-9.4.0-r4.ebuild
index 1118dfad61ae..b7825aeffae0 100644
--- a/app-emulation/libvirt/libvirt-9.4.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-9.4.0-r4.ebuild
@@ -11,7 +11,7 @@ EAPI=8
# Please bump them together!
PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
if [[ ${PV} = *9999* ]]; then
@@ -146,6 +146,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
"${FILESDIR}"/${PN}-9.4.0-fix-paths-for-apparmor.patch
+ "${FILESDIR}"/${PN}-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch
)
pkg_setup() {
diff --git a/app-emulation/libvirt/libvirt-9.5.0.ebuild b/app-emulation/libvirt/libvirt-9.5.0-r1.ebuild
index 0a0255e18fcf..c1e868edd1b4 100644
--- a/app-emulation/libvirt/libvirt-9.5.0.ebuild
+++ b/app-emulation/libvirt/libvirt-9.5.0-r1.ebuild
@@ -11,7 +11,7 @@ EAPI=8
# Please bump them together!
PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
if [[ ${PV} = *9999* ]]; then
@@ -146,6 +146,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
"${FILESDIR}"/${PN}-9.4.0-fix-paths-for-apparmor.patch
+ "${FILESDIR}"/${PN}-9.6.0-storage-Fix-returning-of-locked-objects-from-virStor.patch
)
pkg_setup() {
diff --git a/app-emulation/libvirt/libvirt-9.6.0.ebuild b/app-emulation/libvirt/libvirt-9.6.0.ebuild
index 4adcd0b92658..ac2cd4e25b3e 100644
--- a/app-emulation/libvirt/libvirt-9.6.0.ebuild
+++ b/app-emulation/libvirt/libvirt-9.6.0.ebuild
@@ -11,7 +11,7 @@ EAPI=8
# Please bump them together!
PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
if [[ ${PV} = *9999* ]]; then
diff --git a/app-emulation/libvirt/libvirt-9.8.0.ebuild b/app-emulation/libvirt/libvirt-9.8.0.ebuild
index 4adcd0b92658..f170ab26652d 100644
--- a/app-emulation/libvirt/libvirt-9.8.0.ebuild
+++ b/app-emulation/libvirt/libvirt-9.8.0.ebuild
@@ -11,7 +11,7 @@ EAPI=8
# Please bump them together!
PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
if [[ ${PV} = *9999* ]]; then
@@ -21,7 +21,7 @@ if [[ ${PV} = *9999* ]]; then
else
SRC_URI="https://libvirt.org/sources/${P}.tar.xz
verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
fi
DESCRIPTION="C toolkit to manipulate virtual machines"
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 753f54b9a2e9..195489fd346d 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -11,7 +11,7 @@ EAPI=8
# Please bump them together!
PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
if [[ ${PV} = *9999* ]]; then
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 12:45:37 +0000