diff options
Diffstat (limited to 'app-emulation/libvirt')
-rw-r--r-- | app-emulation/libvirt/Manifest | 22 | ||||
-rw-r--r-- | app-emulation/libvirt/files/libvirt-10.7.0-fix-paths-for-apparmor.patch | 88 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-10.0.0-r5.ebuild (renamed from app-emulation/libvirt/libvirt-10.0.0-r4.ebuild) | 15 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-10.1.0-r4.ebuild (renamed from app-emulation/libvirt/libvirt-10.1.0-r3.ebuild) | 15 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-10.2.0-r3.ebuild (renamed from app-emulation/libvirt/libvirt-10.2.0-r2.ebuild) | 15 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-10.3.0-r4.ebuild (renamed from app-emulation/libvirt/libvirt-10.3.0-r3.ebuild) | 15 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-10.5.0-r2.ebuild (renamed from app-emulation/libvirt/libvirt-10.5.0-r1.ebuild) | 15 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-10.6.0-r1.ebuild (renamed from app-emulation/libvirt/libvirt-10.6.0.ebuild) | 15 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-10.8.0.ebuild | 393 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-9.8.0-r5.ebuild (renamed from app-emulation/libvirt/libvirt-9.8.0-r4.ebuild) | 15 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-9.9.0-r5.ebuild (renamed from app-emulation/libvirt/libvirt-9.9.0-r4.ebuild) | 15 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-9999.ebuild | 21 |
12 files changed, 614 insertions, 30 deletions
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 8fa801a3c74f..0495c2b693fd 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -3,6 +3,7 @@ AUX libvirt-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch 1665 AUX libvirt-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch 9364 BLAKE2B 05ac0aaea8741102a34657b4910569ae5601364bdfd419743900823537f982348ba68cbac37fe10b21c2869531a35d68de8fbeb462c1f66aa0c3af4a97630405 SHA512 72a40984e6de167af8de9aedabdecf79c0f99bb5e7152b6521e87268bf1a1050b9d0d9acbb86c54810029dbde671a518ebd8a3f11590594a3226d818b89188f1 AUX libvirt-10.3.0-vsh-Don-t-init-history-in-cmdComplete.patch 2935 BLAKE2B b3bb5f7f6c21b645f43c2de8c17fe821a12fcd656629bbb44d780f408c5e50f0ee00e0d6bd82a9aba68b4651b711b29170e6989c317bada28edf3aff36cf06ec SHA512 b3421b7972a226660e475616bfc23fffcba825516e14b5267e8410fd178031e848bd7a69128c04f1188c0b75de39e6155cd480649b87a21ab650c2874765ccc7 AUX libvirt-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch 1439 BLAKE2B e5d837f6f7af00fa6b7d3ef94ba0cdcd6120a17c17f52986df451ff2a66a019526f480cdd71592ea89c0629277c751f84b6f79c898d20017d454eda790ce0c66 SHA512 106e029750ed185c823e1759ead99520f628a52a00926cb5a09ee941e4b51cbbdbc91d4b95294eb9225459cb47bbde402b017016ea4ab177b4ba15c2decea90a +AUX libvirt-10.7.0-fix-paths-for-apparmor.patch 3902 BLAKE2B 62d7df4963fe57794252549a45b4809581dbd02bc46c51a8c46b21338a72d0e9aea661c527bcf6e0117ea93bab4fe812e97a6b0957f8d8bc957ee170162732ee SHA512 e4cd5577b37b2800da711576696a0c7888c68d0755f820f002451dc4ecd49ce19e0e8759ec16afdb4489647a4b48b4284c1befd3f43e1a53a8871aa6ab1d4833 AUX libvirt-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch 1125 BLAKE2B d161698463c56b9fbb8b4c4a5ec1b7d65e87e088d68ea1a2cde316449c80d9ba2a4ad5883962eb3e4d31b0441917f6b02d4c781869083c47c8eeb432f6826e8b SHA512 d1dbcb9f6e1c66a38fa09af84248c8ac68d1f263f07b275e12ae3087a6fbd223eeefe20c7b241d02be9529c14bcf311d850d418bc8cecac4cb4e225d78800a41 AUX libvirt-9.4.0-do-not-use-sysconfig.patch 8195 BLAKE2B b731d57dc86fe725d3cbd47b6e691a414107d3594377bd1c73e19735368937a0983e407ec05700213d2ec5802e90f429fd5c7354cd03fb25d3acced952ab6f38 SHA512 2a2e08a6034ed37cafebde3b0fd27913d972d1e9f8816e10a9af951e99f10bd3b9bc7ada1ac50c5085e3fdd3d02301365d031eb6ce3b71102e4b3072d609f21b AUX libvirt-9.4.0-fix_paths_in_libvirt-guests_sh.patch 988 BLAKE2B 5936eafa5c300edad7ed368ec13063d31aea59e3daefeac59cf515ea44667f61aa63b0e2c2a5c88ace24c48cc132789cc5fa1a7c6c04c17e9ac61b114778e46d SHA512 5b80a5ec2898c1c821d0d49b9de67a256f82cb60879215ddde07c2a51f2e8a8b6893fec65617c27edec50cd51a362fb1fcdd21827e8de954f26879adcfa12418 @@ -27,17 +28,20 @@ DIST libvirt-10.5.0.tar.xz 9530296 BLAKE2B 59b6b114e6d4c4752839775ec22b17f530ac8 DIST libvirt-10.5.0.tar.xz.asc 833 BLAKE2B 38b1138de7585e85b7d0a7a93d487e39552b9db989063c3d354f608e005640aaf27c82e99bdaca0448c9a325349c16e3850ceedec380d3d73de4402cdbaad260 SHA512 f764b5cb9cd520b2a73ada3f2438524792c8c8477727fceb5a56ab7fdae8586308998f2fea21071d2e2dae7d168c6dddb5468f302d9f3bac804d6c8e153b760c DIST libvirt-10.6.0.tar.xz 9481992 BLAKE2B 68d88ba7f6d5f74d6ad8753a7716902596338811e9c02b09ba6fbdcc60936abf9509bf5cc300446240fa5dd5d2f779c319bca0a22eadea32b49a758b71524857 SHA512 edec79e89669d5e9a46be35e0d6334a6ed3bbf32426679549bd998bde24cba52b0378843f41a3abb5d781ad53e2a6a54619a0bad3f168c11fb41736cc6af6568 DIST libvirt-10.6.0.tar.xz.asc 833 BLAKE2B 29c5217b665e8ba697adf39920baf6f824bb5d9fdfe96b68f7d4c4f5849c94e44b14b76435fdb98e033b30de73a79b45502a9ba6e7da76ba139c9ebe0bd183b2 SHA512 da50a4760afc094805f087c01646bf6c8165c54e5bad0569a375a1d0791374c27d35fa3780b7104ab248444ed6f8a8a45c20013e57d5129557d6622a9f2a0721 +DIST libvirt-10.8.0.tar.xz 9575348 BLAKE2B fb7d7b6d8a158c0045bb7fae4080cf8d58f8ff36cc2b99cdedcbc88397abf180de94931b3c114463fb717fb33bf16d67ea9b29ae77a673d4e1ca8ba94f195652 SHA512 4979565015d69d078e532944d1d1cdfbb28e2d5625168a80f7b56a323949cf6072c4b8cfb96b92dbae263ee166d1c514651455389f33c90d04cc615865009eee +DIST libvirt-10.8.0.tar.xz.asc 833 BLAKE2B 25b01613df138dbaa921bfe3d3a2384182d4bff1a5828d0b9cccb08e4a48465d0b89391f83824889052e7827b107304289a3a38589039a302c93a15a5d4fe169 SHA512 1099f61b835351165bfa203f3d7d485f16b89e29234a6301e50cf3b5e47e4c7edb9808c23a6fd5045ed44d8349e78596923ea7cc1896e8239b5816e871fdc0cc 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 DIST libvirt-9.9.0.tar.xz 9321556 BLAKE2B 21eae5a95feaf7f5c6ba8dd48732c08212904882a11c48eccfa827d85ddc3df7e064503f21710dbe1b678670e02f003674de915a43a7403fbf85685c4832e21d SHA512 77cea28acf4f3e8c92fbd5bd72ad084be183c07f14e3a9ce35d6d9d62d36ee97a30cef55fb204b3e43f282890ecd7d5827a784a517e7f4ed8b22ee502c3f09d7 DIST libvirt-9.9.0.tar.xz.asc 833 BLAKE2B 3de3674d33c595692e71eeb9c312de76e865d3859d2482ec5b4d29d3cd7644cde080cba0001668efe7876b462f78c0233ab76076ef32943e118b34cca8c1ab4d SHA512 357fc2d1bdbbc26c6e0119a1b5c42e86a116f94bb714da855ab27ca83da0e50c7239d1b8abde3cee8a460ac537f63d518f43470d8329b727b39491771ad191e5 -EBUILD libvirt-10.0.0-r4.ebuild 9951 BLAKE2B 2e8585903a3fff39dbb603e22fdeea0094cf6e550aa70ef3d93482f7fc54cc8aa6a3260492d94468d9660b354cf0f9838c09152f4e932082a7942eed4cda731b SHA512 8b517df3cb550e1462ece2e72bd91e79287af94f5e7b77ed67f7230b7e6a6877aaac5a18fc5eb8ec12bb153d577cc916b5c3bbc42731a72cd777e69214462144 -EBUILD libvirt-10.1.0-r3.ebuild 9862 BLAKE2B 5dcc3770f0310dd2c15243310675f35c8d1bb6b3760a82e27c2a3cf8ee8ecbe9fc691fa280b72634b92aba47aa1d7f94900eced19f4fb74126788c22fc1dfd49 SHA512 346a481d90b1ce2fd401b83748fd4113eae548d02af9551e7f955020bb006bda30d4abfc9400d725504d18c3e2af47ecee17259d8ea5dbd7c53625c17a8a38db -EBUILD libvirt-10.2.0-r2.ebuild 9779 BLAKE2B 1d488ccfa1b8753e7a3146013930253c6293024356a3c4c925a10fafa5720d1c5d42cdb5f6b638f9d4131f7dc027d6e2872eab6441390f0f680c774e6cd04488 SHA512 6063d4da4f02afea9ec20c120e22bc35cfc8a8c0714d1f75e8143b5fc5f4c5da99fa26b6f1f788fef82fabcf4f66d745ca80e2d1ccc587e6743bde34eda91100 -EBUILD libvirt-10.3.0-r3.ebuild 9847 BLAKE2B 7820ece67959e1a13f0bf74f3a3ade086b27cd0f2d516236ddb7313f4466c2ddc759b5a5555b34f6e9a9f43d519b93d28f543fd81b5fd55643eb9d8a9a7ca6f8 SHA512 94800e2f925530cf4599af38684f55153a05529352c90ae6418f1ba5f595fe17a4c83308e06d11621d7b8b4c44cc40169793863ad6d295c3f9b13dcdede9267f -EBUILD libvirt-10.5.0-r1.ebuild 9729 BLAKE2B a6cca65676be19e49f548ff2b8782395264e3a6a34b4ffd3128115009adc350ffa1807a4bbfd5b8b776a6d7f4d44e9cff51d3f5d872b46c4f2d2c39e7d148f5e SHA512 acc1cfdad0c964da25469732105d89e7533bcf48a1df6bad843c6960b0fa775e999fcfef6c8084ebd3b6a30379bdbb8ced75409db469009e0fa9d019af1c7814 -EBUILD libvirt-10.6.0.ebuild 9729 BLAKE2B a6cca65676be19e49f548ff2b8782395264e3a6a34b4ffd3128115009adc350ffa1807a4bbfd5b8b776a6d7f4d44e9cff51d3f5d872b46c4f2d2c39e7d148f5e SHA512 acc1cfdad0c964da25469732105d89e7533bcf48a1df6bad843c6960b0fa775e999fcfef6c8084ebd3b6a30379bdbb8ced75409db469009e0fa9d019af1c7814 -EBUILD libvirt-9.8.0-r4.ebuild 9816 BLAKE2B aaab31d0d6aacc3fae263913a88c0eb00fd20ac60bcc6691907e2d8ad21032fe2c7b4cf79a5ba66aac82e5670855f474b7151d7783995bc5a79514195cc27370 SHA512 5e222e930979a60ac4d3ae834b54413d75d93618f679ea1de39e2da4c2fbbcd57827c6a43f09e79afe725f818338d30050d80e6a2253b432f4f65a966ebcb177 -EBUILD libvirt-9.9.0-r4.ebuild 9870 BLAKE2B b7cda169e257c81bbe1006c6531839fb5b4291f5b26c014f5ade70307989420fdac427b28194300b0090d1dd26062036d6de539cf3451d459ce15d39ada8c967 SHA512 504399a1ebf0ba8bec93dd008a952e984a2d6fc5c4cc8c9485032966f3455d2e0d271a461b2588d50f4fe98210bbe5b83d2ced1f0b45021ec69750ff3696f99d -EBUILD libvirt-9999.ebuild 9729 BLAKE2B a6cca65676be19e49f548ff2b8782395264e3a6a34b4ffd3128115009adc350ffa1807a4bbfd5b8b776a6d7f4d44e9cff51d3f5d872b46c4f2d2c39e7d148f5e SHA512 acc1cfdad0c964da25469732105d89e7533bcf48a1df6bad843c6960b0fa775e999fcfef6c8084ebd3b6a30379bdbb8ced75409db469009e0fa9d019af1c7814 +EBUILD libvirt-10.0.0-r5.ebuild 10297 BLAKE2B 58f3e41758ac7f5f1dcf0d68ceb249f08471b95fa3ab1f12f43f24d3bafd22f9b99ca1567ecbdeef76d43184ef3d1d8457c80702d13ac61a547e6e07d89eee72 SHA512 e06c7f4d1a38a5652f20ad03bcfe266094b01d2856d51d2de6d2a5cbe18a38232e873e9d6d644055ca5006a0b73c8b34e019774c711e123c07baf941a9608089 +EBUILD libvirt-10.1.0-r4.ebuild 10208 BLAKE2B ba05957d24d5b4b92fe2eb074924c43788bd1ee2c6608a9c981c1773a8f233da5b6a7e0e023a72c6a0770ceee6381e9d921dd59998d0d5c7ff61e385040d0e8d SHA512 40cbf881868ca0a4459a77ed925c2ff2548c8a32710f20a950aa36a39b29a4cdec4c5064b76ce51993a1e265f3f6a0954f3d79674b63b646b995f263e4877a1d +EBUILD libvirt-10.2.0-r3.ebuild 10125 BLAKE2B f48018a4fd18c2387e51e293299aae4e8fc4681a2baa99d162a2e8de13d5e5b4107a4a4afb335574b022a18c386ac7f97585c02ee605555bfae927f4c6387173 SHA512 a66498d6ab0cd4176589a628081ce3d740ed70cc7868907b98ec8e34670677d53ab5d39cf39a0b76152e3c3d99a0fe1ea5dbb447faa4b10a6368be04ae24a39f +EBUILD libvirt-10.3.0-r4.ebuild 10193 BLAKE2B 01515dc6f7d77c235b2be818a8f27af6996282cf08d33d57bd84f9a2d3b12ff82082883123d88fc13d6cb8a249c2986ee888e11ab3a9be9de29c24940b6d8352 SHA512 a56a13ce5165a300849708ac6052fbf6703fe0d6db0f05101679f628f43f9e14289e7e3d303f8e0dd66b74160926e32624797df6048e137d88c8fe3b2abcee3f +EBUILD libvirt-10.5.0-r2.ebuild 10075 BLAKE2B 2093b04c2cd3690694d250e9435fe7222e88320f4e21384a11e62bf015f3a0636fadb39e040b87d3e62b1cc343dd09abb3d661912fa0ff9188f8dfdb512ec887 SHA512 0e1c5927c420dcc26f2bdb165112bb7d559a7c4f045ce582e0ed001028b1bbe186646d8b1301abfaa06aeeed65773ed14654bd0277c3dd7cbeeb39ebde87c0d8 +EBUILD libvirt-10.6.0-r1.ebuild 10075 BLAKE2B 2093b04c2cd3690694d250e9435fe7222e88320f4e21384a11e62bf015f3a0636fadb39e040b87d3e62b1cc343dd09abb3d661912fa0ff9188f8dfdb512ec887 SHA512 0e1c5927c420dcc26f2bdb165112bb7d559a7c4f045ce582e0ed001028b1bbe186646d8b1301abfaa06aeeed65773ed14654bd0277c3dd7cbeeb39ebde87c0d8 +EBUILD libvirt-10.8.0.ebuild 10072 BLAKE2B b3b6dd462d2c817a03a63ac2017b3d157ffc8334c20ac579a013bd59de99b0764358149d2853d421244eec5e6aa4e91ba40864f84c4d1afe4cba78c8aef55f77 SHA512 f1d8c447a8c4933be27e20260add44c66046743739f98fa3502ce3e942da61acb0258438c12d165bdd3e4783ab01bc40e9b86bf7ecc2c8aa7a6305390b4c51b2 +EBUILD libvirt-9.8.0-r5.ebuild 10162 BLAKE2B 98255fa21fe673307e542e19bad3056d0c8f53c95b03490b14a592d7924be2bfe2f3de58877f2252ece0c03ac4452283472818e5de8ba36005a56e711f27f0db SHA512 21f96f9c995366525f34afe614ffe417311ba0e378b075e5f2e85eb75779698cd6825a35ecc1c3c11d314c7a9a7f9c330d8425033ceab0b44b15d2016d6b4be5 +EBUILD libvirt-9.9.0-r5.ebuild 10216 BLAKE2B 20828b145408a8809ef629b0ea03644f107c5f174ffc55f8b2ef69f7ea0ae143e89301d4bda9563be56cb7c21b8fe46f5000b243ff83911815a340c5df851cf8 SHA512 cb7c19dddd8782f2d2e28427746afd217c4d2c3d2730a9a36be9bad1e46bfb043f7ae59d6b040d859ec6fb797dcd083171505d82ec66f3e2702860ec88fe597c +EBUILD libvirt-9999.ebuild 10072 BLAKE2B b3b6dd462d2c817a03a63ac2017b3d157ffc8334c20ac579a013bd59de99b0764358149d2853d421244eec5e6aa4e91ba40864f84c4d1afe4cba78c8aef55f77 SHA512 f1d8c447a8c4933be27e20260add44c66046743739f98fa3502ce3e942da61acb0258438c12d165bdd3e4783ab01bc40e9b86bf7ecc2c8aa7a6305390b4c51b2 MISC metadata.xml 3822 BLAKE2B badb40564def06854a0c3af011b5de2888d722996c9b15df570a709161e49796f3d76ba2365c4adc1724f16bee3518d0e87ed6d2619d505b5ba2f1fd02c90f34 SHA512 f31e86b4d0c1faaf5bf0ac253cf20ce7728b94841debb590356efc0fa1e1a3d095a94e69ce0a34f793faadf10ed00ae1212aac54d13288f1975db4f032fd8b50 diff --git a/app-emulation/libvirt/files/libvirt-10.7.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-10.7.0-fix-paths-for-apparmor.patch new file mode 100644 index 000000000000..082be4bd1721 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-10.7.0-fix-paths-for-apparmor.patch @@ -0,0 +1,88 @@ +From 9e543b61227ce4e34f02bb54db226f2284c6e359 Mon Sep 17 00:00:00 2001 +Message-ID: <9e543b61227ce4e34f02bb54db226f2284c6e359.1726482829.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +Date: Tue, 15 Mar 2022 05:23:29 +0100 +Subject: [PATCH] libvirt-10.7.0-fix-paths-for-apparmor.patch + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + src/security/apparmor/libvirt-qemu.in | 1 + + src/security/apparmor/meson.build | 6 +++--- + src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local | 1 - + ...t-aa-helper.in => usr.libexec.libvirt.virt-aa-helper.in} | 4 ++-- + .../apparmor/usr.libexec.libvirt.virt-aa-helper.local | 1 + + 5 files changed, 7 insertions(+), 6 deletions(-) + delete mode 100644 src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local + rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper.in => usr.libexec.libvirt.virt-aa-helper.in} (94%) + create mode 100644 src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local + +diff --git a/src/security/apparmor/libvirt-qemu.in b/src/security/apparmor/libvirt-qemu.in +index 8f17256554..fc9df7ee34 100644 +--- a/src/security/apparmor/libvirt-qemu.in ++++ b/src/security/apparmor/libvirt-qemu.in +@@ -97,6 +97,7 @@ + /usr/share/sgabios/** r, + /usr/share/slof/** r, + /usr/share/vgabios/** r, ++ /usr/share/seavgabios/** r, + + # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140) + /etc/pki/CA/ r, +diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build +index b9257c816d..c1b79fef27 100644 +--- a/src/security/apparmor/meson.build ++++ b/src/security/apparmor/meson.build +@@ -1,5 +1,5 @@ + apparmor_gen_profiles = [ +- 'usr.lib.libvirt.virt-aa-helper', ++ 'usr.libexec.libvirt.virt-aa-helper', + 'usr.sbin.libvirtd', + 'usr.sbin.virtqemud', + 'usr.sbin.virtxend', +@@ -82,8 +82,8 @@ if not conf.has('WITH_APPARMOR_3') + # AppArmor 3.x, upstream's preference is to avoid creating these + # files in order to limit the amount of filesystem clutter. + install_data( +- 'usr.lib.libvirt.virt-aa-helper.local', ++ 'usr.libexec.libvirt.virt-aa-helper.local', + install_dir: apparmor_dir / 'local', +- rename: 'usr.lib.libvirt.virt-aa-helper', ++ rename: 'usr.libexec.libvirt.virt-aa-helper', + ) + endif +diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local +deleted file mode 100644 +index c0990e51d0..0000000000 +--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local ++++ /dev/null +@@ -1 +0,0 @@ +-# Site-specific additions and overrides for 'usr.lib.libvirt.virt-aa-helper' +diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in +similarity index 94% +rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in +index 44645c6989..38fd3bfb88 100644 +--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in +@@ -72,9 +72,9 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { + /**/disk{,.*} r, + + @BEGIN_APPARMOR_3@ +- include if exists <local/usr.lib.libvirt.virt-aa-helper> ++ include if exists <local/usr.libexec.libvirt.virt-aa-helper> + @END_APPARMOR_3@ + @BEGIN_APPARMOR_2@ +- #include <local/usr.lib.libvirt.virt-aa-helper> ++ #include <local/usr.libexec.libvirt.virt-aa-helper> + @END_APPARMOR_2@ + } +diff --git a/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local +new file mode 100644 +index 0000000000..974653d797 +--- /dev/null ++++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local +@@ -0,0 +1 @@ ++# Site-specific additions and overrides for 'usr.libexec.libvirt.virt-aa-helper' +-- +2.44.2 + diff --git a/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild b/app-emulation/libvirt/libvirt-10.0.0-r5.ebuild index 69cebb86b3af..7bceefec30e3 100644 --- a/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-10.0.0-r5.ebuild @@ -19,8 +19,8 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" EGIT_BRANCH="master" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi @@ -124,6 +124,7 @@ RDEPEND=" sys-apps/iproute2[-minimal] ) virtiofsd? ( app-emulation/virtiofsd ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -327,6 +328,16 @@ src_configure() { -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.1.0-r4.ebuild index 79ac27610a78..ae74074960a9 100644 --- a/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-10.1.0-r4.ebuild @@ -19,8 +19,8 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" EGIT_BRANCH="master" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" KEYWORDS="amd64 ~arm arm64 ppc64 x86" fi @@ -124,6 +124,7 @@ RDEPEND=" sys-apps/iproute2[-minimal] ) virtiofsd? ( app-emulation/virtiofsd ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -326,6 +327,16 @@ src_configure() { -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.2.0-r3.ebuild index a3d8c0af30fc..3d4bf8a49993 100644 --- a/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-10.2.0-r3.ebuild @@ -19,8 +19,8 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" EGIT_BRANCH="master" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi @@ -124,6 +124,7 @@ RDEPEND=" sys-apps/iproute2[-minimal] ) virtiofsd? ( app-emulation/virtiofsd ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -325,6 +326,16 @@ src_configure() { -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.3.0-r4.ebuild index f0f0337d8804..375ae4d60960 100644 --- a/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-10.3.0-r4.ebuild @@ -19,8 +19,8 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" EGIT_BRANCH="master" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" KEYWORDS="amd64 ~arm arm64 ppc64 x86" fi @@ -124,6 +124,7 @@ RDEPEND=" sys-apps/iproute2[-minimal] ) virtiofsd? ( app-emulation/virtiofsd ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -326,6 +327,16 @@ src_configure() { -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.5.0-r2.ebuild index 315ce62b97a9..c42ecca088b3 100644 --- a/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-10.5.0-r2.ebuild @@ -19,8 +19,8 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" EGIT_BRANCH="master" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi @@ -127,6 +127,7 @@ RDEPEND=" sys-apps/iproute2[-minimal] ) virtiofsd? ( app-emulation/virtiofsd ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -327,6 +328,16 @@ src_configure() { -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/app-emulation/libvirt/libvirt-10.6.0.ebuild b/app-emulation/libvirt/libvirt-10.6.0-r1.ebuild index 315ce62b97a9..c42ecca088b3 100644 --- a/app-emulation/libvirt/libvirt-10.6.0.ebuild +++ b/app-emulation/libvirt/libvirt-10.6.0-r1.ebuild @@ -19,8 +19,8 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" EGIT_BRANCH="master" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi @@ -127,6 +127,7 @@ RDEPEND=" sys-apps/iproute2[-minimal] ) virtiofsd? ( app-emulation/virtiofsd ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -327,6 +328,16 @@ src_configure() { -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/app-emulation/libvirt/libvirt-10.8.0.ebuild b/app-emulation/libvirt/libvirt-10.8.0.ebuild new file mode 100644 index 000000000000..d87fbdaace17 --- /dev/null +++ b/app-emulation/libvirt/libvirt-10.8.0.ebuild @@ -0,0 +1,393 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Packages which get releases together: +# app-emacs/nxml-libvirt-schemas +# dev-python/libvirt-python +# dev-perl/Sys-Virt +# app-emulation/libvirt +# Please bump them together! + +PYTHON_COMPAT=( python3_{10..13} ) +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 + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" + EGIT_BRANCH="master" +else + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +IUSE=" + apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa + openvz parted pcap policykit +qemu rbd sasl selinux test +udev + virtiofsd virtualbox +virt-network wireshark-plugins xen zfs +" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + qemu? ( libvirtd ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +BDEPEND=" + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + dev-python/docutils + virtual/pkgconfig + bash-completion? ( >=app-shells/bash-completion-2.0 ) + verify-sig? ( sec-keys/openpgp-keys-libvirt )" + +# gettext.sh command is used by the libvirt command wrappers, and it's +# non-optional, so put it into RDEPEND. +# We can use both libnl:1.1 and libnl:3, but if you have both installed, the +# package will use 3 by default. Since we don't have slot pinning in an API, +# we must go with the most recent. +RDEPEND=" + acct-user/qemu + app-misc/scrub + >=dev-libs/glib-2.56.0 + dev-libs/libgcrypt + dev-libs/libnl:3 + >=dev-libs/libxml2-2.9.1 + >=net-analyzer/openbsd-netcat-1.105-r1 + >=net-libs/gnutls-3.2.0:= + net-libs/libtirpc:= + >=net-misc/curl-7.18.0 + sys-apps/dbus + sys-apps/dmidecode + sys-devel/gettext + >=sys-libs/readline-7.0:= + virtual/acl + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap-ng ) + dtrace? ( dev-debug/systemtap ) + firewalld? ( >=net-firewall/firewalld-0.6.3 ) + fuse? ( sys-fs/fuse:= ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( >=sys-block/open-iscsi-1.18.0 ) + iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) + libssh? ( >=net-libs/libssh-0.8.1:= ) + libssh2? ( >=net-libs/libssh2-1.3 ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) + lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + nbd? ( + sys-block/nbdkit + sys-libs/libnbd + ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2[lvm] + ) + pcap? ( >=net-libs/libpcap-1.8.0 ) + policykit? ( + acct-group/libvirt + >=sys-auth/polkit-0.9 + ) + qemu? ( + >=app-emulation/qemu-4.2 + app-crypt/swtpm + dev-libs/json-c:= + ) + rbd? ( sys-cluster/ceph ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + virt-network? ( + net-dns/dnsmasq[dhcp,ipv6(+),script] + net-firewall/ebtables + || ( + >=net-firewall/iptables-1.4.10[ipv6(+)] + net-firewall/nftables + ) + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + virtiofsd? ( app-emulation/virtiofsd ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) + wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) + xen? ( + >=app-emulation/xen-4.9.0 + app-emulation/xen-tools:= + ) + udev? ( + virtual/libudev:= + >=x11-libs/libpciaccess-0.10.9 + ) + zfs? ( sys-fs/zfs ) + kernel_linux? ( sys-apps/util-linux )" +DEPEND=" + ${BDEPEND} + ${RDEPEND} + ${PYTHON_DEPS} + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + ') + ) +" +# The 'circular' dependency on dev-python/libvirt-python is because of +# virt-qemu-qmp-proxy. +PDEPEND=" + qemu? ( dev-python/libvirt-python ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-10.7.0-fix-paths-for-apparmor.patch +) + +python_check_deps() { + if use test; then + python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + # Check kernel configuration: + CONFIG_CHECK="" + use fuse && CONFIG_CHECK+=" + ~FUSE_FS" + + use lvm && CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_MULTIPATH + ~DM_SNAPSHOT" + + use lxc && CONFIG_CHECK+=" + ~BLK_CGROUP + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~CGROUP_NET_PRIO + ~CGROUP_PERF + ~CGROUPS + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + ~NAMESPACES + ~NET_CLS_CGROUP + ~NET_NS + ~PID_NS + ~POSIX_MQUEUE + ~SECURITYFS + ~USER_NS + ~UTS_NS + ~VETH + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS" + + kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES" + + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM + ~IP_NF_FILTER + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP6_NF_FILTER + ~IP6_NF_MANGLE + ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~IP_NF_TARGET_REJECT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + touch "${S}/.mailmap" || die + + default + python_fix_shebang . + + # Skip fragile tests which relies on pristine environment + # (Breaks because of sandbox environment variables) + # bug #802876 + sed -i -e "/commandtest/d" tests/meson.build || die + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" +} + +src_configure() { + local emesonargs=( + $(meson_feature apparmor) + $(meson_feature apparmor apparmor_profiles) + $(meson_feature audit) + $(meson_feature caps capng) + $(meson_feature dtrace) + $(meson_feature firewalld) + $(meson_feature fuse) + $(meson_feature glusterfs) + $(meson_feature glusterfs storage_gluster) + $(meson_feature iscsi storage_iscsi) + $(meson_feature iscsi-direct storage_iscsi_direct) + $(meson_feature libvirtd driver_libvirtd) + $(meson_feature libssh) + $(meson_feature libssh2) + $(meson_feature lvm storage_lvm) + $(meson_feature lvm storage_mpath) + $(meson_feature lxc driver_lxc) + $(meson_feature nbd nbdkit) + $(meson_feature nls) + $(meson_feature numa numactl) + $(meson_feature numa numad) + $(meson_feature openvz driver_openvz) + $(meson_feature parted storage_disk) + $(meson_feature pcap libpcap) + $(meson_feature policykit polkit) + $(meson_feature qemu driver_qemu) + $(meson_feature qemu json_c) + $(meson_feature rbd storage_rbd) + $(meson_feature sasl) + $(meson_feature selinux) + $(meson_feature test tests) + $(meson_feature udev) + $(meson_feature virt-network driver_network) + $(meson_feature virtualbox driver_vbox) + $(meson_feature wireshark-plugins wireshark_dissector) + $(meson_feature xen driver_libxl) + $(meson_feature zfs storage_zfs) + + -Dnetcf=disabled + -Dsanlock=disabled + -Dopenwsman=disabled + + -Ddriver_esx=enabled + -Dinit_script=systemd + -Dqemu_user=$(usex caps qemu root) + -Dqemu_group=$(usex caps qemu root) + -Ddriver_remote=enabled + -Dstorage_fs=enabled + -Ddriver_vmware=enabled + + --localstatedir="${EPREFIX}/var" + -Dinitconfdir="${EPREFIX}/etc/systemd" + -Drunstatedir="${EPREFIX}/run" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + ) + + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + + meson_src_configure +} + +src_test() { + export VIR_TEST_DEBUG=1 + # Don't run the syntax check tests, they're fragile and not relevant + # to us downstream anyway. + # We also crank up the timeout (as Fedora does) just to preempt failures + # on slower arches. + meson_src_test --no-suite syntax-check --timeout-multiplier 10 +} + +src_install() { + meson_src_install + + # Depending on configuration option, libvirt will create some bogus + # directoreis. They are either not used, or libvirtd is able to create + # them on demand, so let's remove them. + # + # Note, we are using -f here so that rm does not fail or warn if the + # directory is nonexistent. + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + rm -rf "${D}"/run + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + tmpfiles_process libvirtd.conf + readme.gentoo_print_elog +} diff --git a/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild b/app-emulation/libvirt/libvirt-9.8.0-r5.ebuild index 62d04583be8e..b34f687d0a17 100644 --- a/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-9.8.0-r5.ebuild @@ -19,8 +19,8 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" EGIT_BRANCH="master" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" KEYWORDS="amd64 ~arm arm64 ppc64 x86" fi @@ -124,6 +124,7 @@ RDEPEND=" net-misc/radvd sys-apps/iproute2[-minimal] ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -317,6 +318,16 @@ src_configure() { -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild b/app-emulation/libvirt/libvirt-9.9.0-r5.ebuild index 9ccc939d1bfc..82ed2ea58b7b 100644 --- a/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-9.9.0-r5.ebuild @@ -19,8 +19,8 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" EGIT_BRANCH="master" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi @@ -125,6 +125,7 @@ RDEPEND=" sys-apps/iproute2[-minimal] ) virtiofsd? ( app-emulation/virtiofsd ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -318,6 +319,16 @@ src_configure() { -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 315ce62b97a9..d87fbdaace17 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -19,8 +19,8 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" EGIT_BRANCH="master" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" + SRC_URI="https://download.libvirt.org/${P}.tar.xz + verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi @@ -111,7 +111,7 @@ RDEPEND=" qemu? ( >=app-emulation/qemu-4.2 app-crypt/swtpm - >=dev-libs/yajl-2.0.3:= + dev-libs/json-c:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) @@ -127,6 +127,7 @@ RDEPEND=" sys-apps/iproute2[-minimal] ) virtiofsd? ( app-emulation/virtiofsd ) + virtualbox? ( <app-emulation/virtualbox-7.1.0 ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -157,7 +158,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-10.7.0-fix-paths-for-apparmor.patch ) python_check_deps() { @@ -297,7 +298,7 @@ src_configure() { $(meson_feature pcap libpcap) $(meson_feature policykit polkit) $(meson_feature qemu driver_qemu) - $(meson_feature qemu yajl) + $(meson_feature qemu json_c) $(meson_feature rbd storage_rbd) $(meson_feature sasl) $(meson_feature selinux) @@ -327,6 +328,16 @@ src_configure() { -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) + # Workaround for bug #938302 + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } |