diff options
Diffstat (limited to 'app-emulation/libvirt')
| -rw-r--r-- | app-emulation/libvirt/Manifest | 20 | ||||
| -rw-r--r-- | app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch | 19 | ||||
| -rw-r--r-- | app-emulation/libvirt/files/libvirt-5.2.0-fix-paths-for-apparmor.patch | 116 | ||||
| -rw-r--r-- | app-emulation/libvirt/files/libvirt-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch | 39 | ||||
| -rw-r--r-- | app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch (renamed from app-emulation/libvirt/files/libvirt-6.2.0-do-not-use-sysconfig.patch) | 118 | ||||
| -rw-r--r-- | app-emulation/libvirt/files/libvirtd.init-r18 | 33 | ||||
| -rw-r--r-- | app-emulation/libvirt/files/virtlockd.init-r1 | 23 | ||||
| -rw-r--r-- | app-emulation/libvirt/files/virtlogd.init-r1 | 23 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-6.0.0-r3.ebuild | 360 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-6.2.0-r2.ebuild | 2 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-6.5.0.ebuild (renamed from app-emulation/libvirt/libvirt-6.1.0-r1.ebuild) | 13 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-9999.ebuild | 137 | ||||
| -rw-r--r-- | app-emulation/libvirt/metadata.xml | 3 |
13 files changed, 92 insertions, 814 deletions
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 3ca29f1d765f..87c7458f34db 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,26 +1,18 @@ AUX README.gentoo-r3 2062 BLAKE2B bf45e0f63182dbff31982581045389c5510d5c3e648de34982ea9861923833a024681072ecf4f76b2ca025da30ed4a5a0f1273c85b4c0beb08189f80ce54de3e SHA512 6c54bd70a8521fcfe7eb21df87466c1df0026c569700f3d1b14c76cef4c1e68a56aa13d66b5214ae35a4c24bca58350d07d3e54ca3204ad336be618f51b00984 -AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 BLAKE2B e796f4e32f00e8970eabf723520601b26c7fa5f7579d538299538632ba036dafbb2dc64ad40d10152c0637043b2a649e1dc08468d1f250e00ee0af095d94a093 SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588 -AUX libvirt-5.2.0-fix-paths-for-apparmor.patch 4372 BLAKE2B ac8c78097b8125932fd89756ca7332665e2080afc5de37e0a31d6f2a84e15f21e01d41b39c7781c26cf514c74a215623c0013e67cffe7543892d5b13d3022642 SHA512 391e78a2ea113c38afb07b9f0c7638748e5bc04fb88ea96be7ff439624c429ff0106024674546b01e750d8b1e1418d13040bc8462653eb8567651378b66d53a5 AUX libvirt-6.0.0-do-not-use-sysconf.patch 5166 BLAKE2B d458e7b70320b7fb5d52f7a745b8dd4bc3e1906c57141935575ab586c5c8434634c3444ab5042d1796ef6ac6631553939ae110ed83b3f7b426724f8c2acfc23e SHA512 0d920a0b633dcf60fc41b7cff8c9903c40cdb157c5145da72a3d3090b6b174a344d4067b2436320726d5cfc5cf939ee0a2339196763069332db2733deab04577 AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29db29a6eb537ecd7b9d12aed097c5e0e01c07161adac1dec8a6f129bc098172fe6de4e78a2fbe5e67052005a7c5d1d17cbbb63ad27025662b9fa34 SHA512 dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2 -AUX libvirt-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch 1279 BLAKE2B 07c82c6c4c18c3de97619b65b782edbd32df71dc4abaade1059023176dc50ff3b1aeb5bb26b5a3d7a47d6a4249d0580c16e65a1a386db43eebb49fd15b9e3c03 SHA512 e1147209b00082629b57f98d76765b59022f1bf17923ddd66ff55db8bc04ee505f8e4df6a628573a52a144e1dcda91adbb2631608bb2ae487bfe2aab4ddeabd6 AUX libvirt-6.1.0-fix-paths-for-apparmor.patch 3174 BLAKE2B ff45ec24c1d06a76b434bd9cc53c6abf69928d1a4b7ff278b1f8f041ba9eeee7a6769c7ba7d49d2bd0d26f93fc8ceb951cafd7d6d0b24be58e058b8e2da532f2 SHA512 6f221b66d9cebf37e61cae48d906b57b46d375d9e799e4fce9250401ee97b7f5bcac3b31743f63760bad53cdfa76182bd8c8ddda1fd4fd35b24fa0abd6d1a36c -AUX libvirt-6.2.0-do-not-use-sysconfig.patch 11738 BLAKE2B 48d4f0010f4a27957bd5345144e2aecde99b9b55137ba0731a6340faa18130f20d2a996b9a3cbdbf026a89a131a02534b91bb747f142f6c2bf72bced6241b1d5 SHA512 4c8aa7097e740078ea99118cb6a239244046ee3b3545d8733af3c2545fdf067cdc20b451c9015c4e104dc4139efef73f6189988aa957b9fc76b296abfff91f85 +AUX libvirt-6.5.0-do-not-use-sysconfig.patch 7271 BLAKE2B 5c6fcf5dbfb43b66179f97d1825054aa8291ee097d8db91fc0aae8e90c54167aaa12df5a732f30a89235a449832299411b39190cffbbf96ab689d650604bb042 SHA512 acc6674d15f2c50e02371faf27ea8cca3ade1af83d93687a00e589eb109f1a752c971c503b4c7bcab16287f7a31ecc8cc880bf63f428a02a3701aea735f5ff5e AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0 AUX libvirtd.confd-r5 740 BLAKE2B 74a069f4902dd1352f06029c886200615a35870ff88496c91956d23a3172db0789086622422f545498e92b7f8de41225022185fe291dd580cbacdeb783163f4b SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91 -AUX libvirtd.init-r18 1114 BLAKE2B a934bcacb8d3c041e9bd4f287bc137975b4ef73111e7012f5ebc6cc84250a7ac8f4388d2c0bff79a4254f2639623879d83d97d72f0d51101a05165b6bb9af522 SHA512 2f43d33b6eee2a571269c1a20cfbf0ce6a189522ca4b22826b6140991b4657869afca7800dab145a18583c39f101054a8d6258ca0a58a578dc65d16c7a993636 AUX libvirtd.init-r19 1114 BLAKE2B a69f5a07e0b946a3167ac4509611d08a8b848e7337677cce36f0eff8e2f646fb03d92279eb3c4427b25649210c8acf280cb9877e0c5c363f1f358b211b208d9d SHA512 6192888e5dbf384cfecab2c1e55fb9a2ceba83390aa71cd8c0be0526a7cc3f9c2a9d7a71d4fe6bbb528871e8e7bc5c73e385ef56eec2366bcc75eb361e7d1894 AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed -AUX virtlockd.init-r1 563 BLAKE2B b8e1d2c29570480b477f14c25042f227093474710f1d9d445472e512415f73c574657a1eaddea892d15a838eb7fce2a0f0dc067dadfd393199640185606bff1f SHA512 524f33171cdbee8a36b341938bf5d45da88893452ed83fbe0fbcfd5191ea6127f3364fa36d6222c37dede1e0c3f195c3a68a30809fb6b11b5ce750ca297be629 AUX virtlockd.init-r2 573 BLAKE2B 83bbd228bd59fa29f1d974bc5eec8af0b701328a0a64bbb9e2d9cb918d5d0b3c0d5e791afa18f47ffa2c429082083912fda3f2401c3c5b3d8d85ea8b7cacf440 SHA512 11bf7208e8da8cf7b907049100d095f4d6b5d215a0955fa620e50d6d541d3ecd9d779a7903c64feb25d17545c45491d52441e14a04f2c793f3b03dee7784c482 -AUX virtlogd.init-r1 562 BLAKE2B 52b0dce0d3dd856d6cbffbe37e721d8f053d53a4802ce3a1e83ab78a8e0920d66436d9cf5e6d6e4fde13debb90e0b61355befd9e67d6546967f19f8c26736dbd SHA512 98e705fbd08f0f8342d33762c98786ca0690f617be27ede5ddf2c5053eeae3f441403415f4c961a7f388dc844075d21515a8ffd62d1654d1049e06910bb1c7b9 AUX virtlogd.init-r2 572 BLAKE2B e6a86e34eda78fc032df17e1bd94095e357770f4036e19fff895266b58df7e31774f6004fec56fad9e69bf7d1afa5d898bdebe018013877f8844d05b3a46d509 SHA512 d5d83edee8a4bdf0dac79abc129ff7ec11573aa580e32963d7c7d47133e276a4427d8653683fc8b0a6c1c2aba631e5875c73454d6fef3bcac6dcaca542e69f34 -DIST libvirt-6.0.0.tar.xz 8686092 BLAKE2B 669054aa3bb3e4f2cf0be2e9ea796b820786661f65495597322e178d7c7e42355b0e3752c8a847cb2fc4405928a30a00544829647aa84cc2e71bc0cb8ce9af5f SHA512 64259c0cffa9fc01192c5474f69d88a61ed0bae0a100379fed6112723a37eff1865ccfc85a19d6b8cd39ed504f04998bb3f6390aaafff797bb41ef65b6ec413c -DIST libvirt-6.1.0.tar.xz 8276964 BLAKE2B cf57e28d17e868ab4a69f03fe77b0d779362c6cb8cf1a38196ba7bad873ec4ecfa8ad1744ce97251820ab898be1ddc9bf30b788f1708172bfd23ec2c7cd3bdac SHA512 17a2641f300a4a05149261bae74ac856e9a2511a259146595d2e2412c4a0601d88369b0544ba86edc80e433a47cf828317d8de38c6ec86a1b3efaca75294a606 DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef0df49c40028e486e88fcf14181869e0dfd87f0eabcdd184df67dda5b5fbdc0c2375832f1534faff531779255dd SHA512 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4 -EBUILD libvirt-6.0.0-r3.ebuild 8891 BLAKE2B ad688cf1ccc1dc04d34844ef0dc9387f42be1547b73e4c331ea4879884fd8de70dba24edb1a865ac0416162248b8e90411df678a67a9759b6b08329087e9a13f SHA512 f77ec0b1abcb41a5e0418fc4fcee2ddc6f3d9ca00e94a0beebfd8b0a5b03a972efa99835fb5c4b935c41766adab78dcb9b02bb282c3ff08850932f07742f9fe2 -EBUILD libvirt-6.1.0-r1.ebuild 8777 BLAKE2B d093067d76d19a47a804e88c66c35a161866f23a5a048cd10c865c26493f98db7b8fa729c6adf24cbe5af6cdae5b6570c4c1d0a88a4b1571575a15351e5a9e40 SHA512 786874faf23852522bdb3b8e5917d9ace7cc4341a5d3b50e87117d03cff078deb4071881d492afdb29108427224f8c9c1aeaf7efd45bc246845de51f2c4db832 -EBUILD libvirt-6.2.0-r2.ebuild 8737 BLAKE2B c5ec7d389d67e93c53a494c1d585d06292413fa6ace2757d8906885ca35a31c97858ebc1c9aab44275392b766590b34fa17195fed932c1477850e4d853ac92e5 SHA512 52460fa384383a3f22b3b91a4ee6e05b3771f9c749592a299e11cb1d65d3f098dcce61ba9614e9389b278bd4594034547709f1665b80e878a4eae8a4276e20c8 -EBUILD libvirt-9999.ebuild 8679 BLAKE2B 73abd5971e97b01b7056c007f8018d7da4d565ee3b371c1b499e3516717ebc40535f2401505c3d01b772e96184776c958bf4e78473dc1871a148b4face0be528 SHA512 b2fee1a0ca9cadab3f5de9623d813d2cd486c1068eab694b900bceaf9d89935a5e78c233783c06c26fbda31abeaaf8b6519da2f651cc26e20531a0826771b57b -MISC metadata.xml 3702 BLAKE2B cf4bd9200b3cc77129b7a56ad3e399d1371613dbb4fbdda96c4977ff2b2e8340afef5f10efe6a5f82015c34662dcccef4db8740a666b4714741d97973ec772a8 SHA512 2ba4fd9991263b8884856512faedfaecec0896e8cfdd9bf76a19838f6aaea766c43ca97d40753cd434c6b38a859ddd59b3c9d26b759871c6bdebbff160521509 +DIST libvirt-6.5.0.tar.xz 9407160 BLAKE2B 592aace555a3b72311cb430784587180fa7dbf74f75509cd8373a046339b9c4c0707bf530dd2d06146d78a85f8af3dba5d0b146ecec180d3cc4d3bf78c19da61 SHA512 30a032270304b97945ff2c5087c72c2f5510634186f2eaf7c3d834a72cddcaec97bbe5ccc86802728a59f4c80b5bb54757400683df5f20175757cfe07ce67453 +EBUILD libvirt-6.2.0-r2.ebuild 8743 BLAKE2B 7afa57918ba4756e5a5ed09c1c50e7aa28c3eeb5279014dfcf0c671ab39d8ddf3790fe33ceec275cbe75ee305dce28f8820100fdc6aea7e9bc37e94099591ea9 SHA512 4d6423227ac05c4275696080268e624fc390724853fa4baa9e7428ebadecc802afa000355780ba7797518b3b300686c7294e5b293a56374381de05ba821606a1 +EBUILD libvirt-6.5.0.ebuild 8708 BLAKE2B 22835f2786b4bbc8d6060c8a58775b6a81fb789b0ad4742572ba81fc8ed9e7ef9b1ac96ca0dbf9fedc16726d48a3207af74eabe50b9b8e178d29555f23871ee9 SHA512 11fa732bc07ed559dbf28e372cac67a8a55f07c7b54e597170e73e992dc72d09e4aa05f023fa753ab37240f010ef0869bd015f4504de44a5151424f3baf2b3ed +EBUILD libvirt-9999.ebuild 8534 BLAKE2B c23172d3a9d4a73f22cda8cfb8c1a4a032c8d0c66de6976aab68142b9389e6eaaf739aa6c723f8ae322e0fae1aafc89befa8fe11c9b83d5345484b45cadfdc3d SHA512 678c99b48f8ec9a45ab7610478b6fdf32785292b796b5cf6626176f2d38b3a67280066c01e3294c0fa0c3eeccb41fac773d93ffc47c5adfb31aca12515928801 +MISC metadata.xml 3620 BLAKE2B 896dbfd54e204d33a00187e5c97dabaa292b13b17589e177d72385355ac72899fe10e4a6bf11e56590ce60c5b56db297be7464841c64bc5bcf22e27cc07c628a SHA512 1e1f0ac3b1664efec145fc138dad04417241f30462e45379b95c59a81f2148709fdb5a659366156a3092f1b55ee5d6d41cd24331fdb173ce411abe2681c2f828 diff --git a/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch deleted file mode 100644 index ddedb1f90cd3..000000000000 --- a/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in -index 7f74b85..ea58119 100644 ---- a/tools/libvirt-guests.sh.in -+++ b/tools/libvirt-guests.sh.in -@@ -41,11 +41,11 @@ CONNECT_RETRIES=10 - RETRIES_SLEEP=1 - SYNC_TIME=0 - --test -f "$sysconfdir"/sysconfig/libvirt-guests && -- . "$sysconfdir"/sysconfig/libvirt-guests -+test -f "$sysconfdir"/libvirt/libvirt-guests.conf && -+ . "$sysconfdir"/libvirt/libvirt-guests.conf - - LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests --VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests -+VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests - - RETVAL=0 - diff --git a/app-emulation/libvirt/files/libvirt-5.2.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-5.2.0-fix-paths-for-apparmor.patch deleted file mode 100644 index 866c6357b6e4..000000000000 --- a/app-emulation/libvirt/files/libvirt-5.2.0-fix-paths-for-apparmor.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 563706143779166624812b3faf498d869f5dd383 Mon Sep 17 00:00:00 2001 -Message-Id: <563706143779166624812b3faf498d869f5dd383.1547196492.git.mprivozn@redhat.com> -From: Michal Privoznik <mprivozn@redhat.com> -Date: Fri, 11 Jan 2019 09:41:06 +0100 -Subject: [PATCH] gentoo: fix paths for apparmor - -Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---- - src/security/Makefile.inc.am | 10 +++++----- - src/security/apparmor/libvirt-qemu | 2 ++ - ...bvirt.virt-aa-helper => usr.libexec.virt-aa-helper} | 4 ++-- - src/security/apparmor/usr.sbin.libvirtd | 6 ++++-- - 4 files changed, 13 insertions(+), 9 deletions(-) - rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (93%) - -diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am -index b24cdfd083..ae8e979b84 100644 ---- a/src/security/Makefile.inc.am -+++ b/src/security/Makefile.inc.am -@@ -36,7 +36,7 @@ EXTRA_DIST += \ - security/apparmor/TEMPLATE.lxc \ - security/apparmor/libvirt-qemu \ - security/apparmor/libvirt-lxc \ -- security/apparmor/usr.lib.libvirt.virt-aa-helper \ -+ security/apparmor/usr.libexec.virt-aa-helper \ - security/apparmor/usr.sbin.libvirtd \ - $(NULL) - -@@ -90,7 +90,7 @@ endif WITH_SECDRIVER_APPARMOR - if WITH_APPARMOR_PROFILES - apparmordir = $(sysconfdir)/apparmor.d/ - apparmor_DATA = \ -- security/apparmor/usr.lib.libvirt.virt-aa-helper \ -+ security/apparmor/usr.libexec.virt-aa-helper \ - security/apparmor/usr.sbin.libvirtd \ - $(NULL) - -@@ -110,11 +110,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" - install-apparmor-local: - $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" - echo "# Site-specific additions and overrides for \ -- 'usr.lib.libvirt.virt-aa-helper'" \ -- >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+ 'usr.libexec.virt-aa-helper'" \ -+ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - - uninstall-apparmor-local: -- rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - rmdir "$(APPARMOR_LOCAL_DIR)" || : - - INSTALL_DATA_LOCAL += install-apparmor-local -diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu -index eaa5167525..9be50bbbe0 100644 ---- a/src/security/apparmor/libvirt-qemu -+++ b/src/security/apparmor/libvirt-qemu -@@ -87,6 +87,8 @@ - /usr/share/AAVMF/** r, - /usr/share/qemu-efi/** r, - /usr/share/slof/** r, -+ /usr/share/seavgabios/** r, -+ /usr/share/edk2-ovmf/** r, - - # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140) - /etc/pki/CA/ r, -diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.libexec.virt-aa-helper -similarity index 93% -rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper -rename to src/security/apparmor/usr.libexec.virt-aa-helper -index de9436872c..99ab4ea527 100644 ---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper -+++ b/src/security/apparmor/usr.libexec.virt-aa-helper -@@ -1,7 +1,7 @@ - # Last Modified: Mon Apr 5 15:10:27 2010 - #include <tunables/global> - --profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { -+profile virt-aa-helper /usr/libexec/virt-aa-helper { - #include <abstractions/base> - - # needed for searching directories -@@ -36,7 +36,7 @@ - deny /dev/mapper/ r, - deny /dev/mapper/* r, - -- /usr/{lib,lib64}/libvirt/virt-aa-helper mr, -+ /usr/libexec/virt-aa-helper mr, - /{usr/,}sbin/apparmor_parser Ux, - - /etc/apparmor.d/libvirt/* r, -@@ -66,5 +66,5 @@ - /**.[iI][sS][oO] r, - /**/disk{,.*} r, - -- #include <local/usr.lib.libvirt.virt-aa-helper> -+ #include <local/usr.libexec.virt-aa-helper> - } -diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd -index f0ffc53008..8a402bd6ec 100644 ---- a/src/security/apparmor/usr.sbin.libvirtd -+++ b/src/security/apparmor/usr.sbin.libvirtd -@@ -98,8 +98,10 @@ - audit deny /sys/kernel/security/apparmor/.* rwxl, - /sys/kernel/security/apparmor/profiles r, - /usr/{lib,lib64}/libvirt/* PUxr, -- /usr/{lib,lib64}/libvirt/libvirt_parthelper ix, -- /usr/{lib,lib64}/libvirt/libvirt_iohelper ix, -+ /usr/libexec/virt-aa-helper PUxr, -+ /usr/libexec/libvirt_lxc PUxr, -+ /usr/libexec/libvirt_parthelper ix, -+ /usr/libexec/libvirt_iohelper ix, - /etc/libvirt/hooks/** rmix, - /etc/xen/scripts/** rmix, - --- -2.19.2 diff --git a/app-emulation/libvirt/files/libvirt-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch b/app-emulation/libvirt/files/libvirt-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch deleted file mode 100644 index 62f89a378bcc..000000000000 --- a/app-emulation/libvirt/files/libvirt-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ba756e8d0928ac4ddb7decd1033de2121201d941 Mon Sep 17 00:00:00 2001 -Message-Id: <ba756e8d0928ac4ddb7decd1033de2121201d941.1585986243.git.mprivozn@redhat.com> -From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com> -Date: Mon, 20 Jan 2020 07:55:48 +0100 -Subject: [PATCH] qemu: end the agent job in qemuDomainSetTimeAgent -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This function grabs an agent job but ends a monitor job. -End the agent job instead. - -https://bugzilla.redhat.com/show_bug.cgi?id=1792723 - -Signed-off-by: Ján Tomko <jtomko@redhat.com> -Reported-by: Dan Zheng <dzheng@redhat.com> -Fixes: e005c95f56fee9ed780be7f8db103d690bd34cbd -(cherry picked from commit d61f95cf6a6fbd564e104c168d325581acd9cd8d) -Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---- - src/qemu/qemu_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index d6b1e9f00c..48cd5b95d9 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -20376,7 +20376,7 @@ qemuDomainSetTimeAgent(virQEMUDriverPtr driver, - qemuDomainObjExitAgent(vm, agent); - - endjob: -- qemuDomainObjEndJob(driver, vm); -+ qemuDomainObjEndAgentJob(vm); - return ret; - } - --- -2.24.1 - diff --git a/app-emulation/libvirt/files/libvirt-6.2.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch index 3dc2588b7bfd..74b5954a0cf1 100644 --- a/app-emulation/libvirt/files/libvirt-6.2.0-do-not-use-sysconfig.patch +++ b/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch @@ -1,37 +1,6 @@ -From c378ab3e7fe84ac69ad787c099f24fd32dbbf6e4 Mon Sep 17 00:00:00 2001 -Message-Id: <c378ab3e7fe84ac69ad787c099f24fd32dbbf6e4.1586091631.git.mprivozn@redhat.com> -From: Michal Privoznik <mprivozn@redhat.com> -Date: Sun, 5 Apr 2020 14:41:45 +0200 -Subject: [PATCH] Do not use sysconfig - -Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---- - src/Makefile.am | 21 ++------------------- - src/interface/virtinterfaced.service.in | 1 - - src/libxl/virtxend.service.in | 1 - - src/locking/virtlockd.service.in | 3 +-- - src/logging/virtlogd.service.in | 3 +-- - src/lxc/virtlxcd.service.in | 1 - - src/network/virtnetworkd.service.in | 1 - - src/node_device/virtnodedevd.service.in | 1 - - src/nwfilter/virtnwfilterd.service.in | 1 - - src/qemu/virtqemud.service.in | 1 - - src/remote/libvirtd.service.in | 3 +-- - src/remote/virtproxyd.service.in | 1 - - src/secret/virtsecretd.service.in | 1 - - src/storage/virtstoraged.service.in | 1 - - src/vbox/virtvboxd.service.in | 1 - - src/vz/virtvzd.service.in | 1 - - tools/Makefile.am | 13 ++----------- - tools/libvirt-guests.service.in | 2 +- - tools/libvirt-guests.sysconf | 6 ++++++ - 19 files changed, 14 insertions(+), 49 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 12dd6b80e1..10f1bb769d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -522,23 +522,6 @@ EXTRA_DIST += \ +@@ -522,23 +522,6 @@ $(SYSCONF_FILES) \ $(OPENRC_CONF_FILES) @@ -55,7 +24,7 @@ index 12dd6b80e1..10f1bb769d 100644 OPENRC_CONF_DIR = $(sysconfdir)/conf.d install-openrc-conf: -@@ -604,14 +587,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system +@@ -604,14 +587,14 @@ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) @@ -72,11 +41,9 @@ index 12dd6b80e1..10f1bb769d 100644 rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : -diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in -index 73d409b81b..2d2c0138f5 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -84,11 +51,9 @@ index 73d409b81b..2d2c0138f5 100644 ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in -index a863917467..5b2d16f627 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in -@@ -17,7 +17,6 @@ ConditionPathExists=/proc/xen/capabilities +@@ -17,7 +17,6 @@ [Service] Type=notify @@ -96,11 +61,9 @@ index a863917467..5b2d16f627 100644 ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index e7f8057c06..2449b201d9 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) +@@ -7,8 +7,7 @@ Documentation=https://libvirt.org [Service] @@ -110,11 +73,9 @@ index e7f8057c06..2449b201d9 100644 ExecReload=/bin/kill -USR1 $MAINPID # Loosing the locks is a really bad thing that will # cause the machine to be fenced (rebooted), so make -diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in -index daff48e67d..43736191d5 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) +@@ -7,8 +7,7 @@ Documentation=https://libvirt.org [Service] @@ -124,11 +85,9 @@ index daff48e67d..43736191d5 100644 ExecReload=/bin/kill -USR1 $MAINPID # Loosing the logs is a really bad thing that will # cause the machine to be fenced (rebooted), so make -diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in -index 3af7c1a52d..cff421d988 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in -@@ -18,7 +18,6 @@ Documentation=https://libvirt.org +@@ -18,7 +18,6 @@ [Service] Type=notify @@ -136,11 +95,9 @@ index 3af7c1a52d..cff421d988 100644 ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS ExecReload=/bin/kill -HUP $MAINPID KillMode=process -diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in -index e7f1326945..49fb7b99ff 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -16,7 +16,6 @@ [Service] Type=notify @@ -148,11 +105,9 @@ index e7f1326945..49fb7b99ff 100644 ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in -index d2453dd620..847263e8b9 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -160,11 +115,9 @@ index d2453dd620..847263e8b9 100644 ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in -index dda7c01a3d..bb0bf0afa4 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -172,11 +125,9 @@ index dda7c01a3d..bb0bf0afa4 100644 ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in -index 8abc9d3a7f..3539be3c0b 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in -@@ -18,7 +18,6 @@ Documentation=https://libvirt.org +@@ -18,7 +18,6 @@ [Service] Type=notify @@ -184,11 +135,9 @@ index 8abc9d3a7f..3539be3c0b 100644 ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS ExecReload=/bin/kill -HUP $MAINPID KillMode=process -diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 90b2cad5b0..d16b11ec8d 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in -@@ -25,8 +25,7 @@ Documentation=https://libvirt.org +@@ -28,8 +28,7 @@ [Service] Type=notify @@ -198,11 +147,9 @@ index 90b2cad5b0..d16b11ec8d 100644 ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=on-failure -diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in -index f43ce9ee6e..9076e638a7 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -210,11 +157,9 @@ index f43ce9ee6e..9076e638a7 100644 ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in -index 8444142a3a..57e74c2d38 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -222,11 +167,9 @@ index 8444142a3a..57e74c2d38 100644 ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in -index fc3e9a1b69..a82319b214 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in -@@ -15,7 +15,6 @@ Documentation=https://libvirt.org +@@ -15,7 +15,6 @@ [Service] Type=notify @@ -234,11 +177,9 @@ index fc3e9a1b69..a82319b214 100644 ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in -index ebb31dde07..21eec57bab 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org +@@ -14,7 +14,6 @@ [Service] Type=notify @@ -246,23 +187,9 @@ index ebb31dde07..21eec57bab 100644 ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in -index f551cb8fbf..99b9b4f1bf 100644 ---- a/src/vz/virtvzd.service.in -+++ b/src/vz/virtvzd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtvzd - ExecStart=@sbindir@/virtvzd $VIRTVZD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 53df930e0a..598a62ddef 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am -@@ -294,15 +294,6 @@ install-data-local: install-systemd install-nss \ +@@ -294,15 +294,6 @@ uninstall-local: uninstall-systemd uninstall-nss \ uninstall-bash-completion @@ -278,7 +205,7 @@ index 53df930e0a..598a62ddef 100644 EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status -@@ -322,12 +313,12 @@ EXTRA_DIST += libvirt-guests.service.in +@@ -322,12 +313,12 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD @@ -293,11 +220,9 @@ index 53df930e0a..598a62ddef 100644 rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 10c664016a..f0f417bffb 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in -@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) +@@ -10,7 +10,7 @@ Documentation=https://libvirt.org [Service] @@ -306,8 +231,6 @@ index 10c664016a..f0f417bffb 100644 # Hack just call traditional service until we factor # out the code ExecStart=@libexecdir@/libvirt-guests.sh start -diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -index 0765efec21..a1a53d8a8d 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -1,3 +1,9 @@ @@ -320,6 +243,3 @@ index 0765efec21..a1a53d8a8d 100644 # Customizations for the libvirt-guests.service systemd unit # URIs to check for running guests --- -2.24.1 - diff --git a/app-emulation/libvirt/files/libvirtd.init-r18 b/app-emulation/libvirt/files/libvirtd.init-r18 deleted file mode 100644 index 5e9efc83e2f9..000000000000 --- a/app-emulation/libvirt/files/libvirtd.init-r18 +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Virtual Machine Management daemon (libvirt)" - -LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"} -LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"} - -command="/usr/sbin/libvirtd" -command_args="-d ${LIBVIRTD_OPTS}" -start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab" -pidfile="/run/libvirtd.pid" -retry="${LIBVIRTD_TERMTIMEOUT}" - -depend() { - need virtlogd - use ceph dbus iscsid virtlockd - after cgconfig corosync ebtables iptables ip6tables nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled - USE_FLAG_FIREWALLD -} - -start_pre() { - # Test configuration directories in /etc/libvirt/ to be either not - # present or a directory, i.e. not a regular file, bug #532892 - - checkpath --directory /etc/libvirt/lxc || return 1 - checkpath --directory /etc/libvirt/nwfilter || return 1 - [ -L /etc/libvirt/qemu ] || - checkpath --directory /etc/libvirt/qemu || return 1 - [ -L /etc/libvirt/storage ] || - checkpath --directory /etc/libvirt/storage || return 1 -} diff --git a/app-emulation/libvirt/files/virtlockd.init-r1 b/app-emulation/libvirt/files/virtlockd.init-r1 deleted file mode 100644 index 1e812d870c19..000000000000 --- a/app-emulation/libvirt/files/virtlockd.init-r1 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="libvirt virtual machine lock manager" -command="/usr/sbin/virtlockd" -command_args="-d" -pidfile="/run/virtlockd.pid" - -extra_started_commands="reload" -description_reload="re-exec the daemon, while maintaining locks and clients" - - -depend() { - after ntp-client ntpd nfs nfsmount corosync -} - -reload() { - ebegin "re-exec() virtlockd" - - start-stop-daemon --signal SIGUSR1 \ - --exec "${command}" --pidfile "${pidfile}" -} diff --git a/app-emulation/libvirt/files/virtlogd.init-r1 b/app-emulation/libvirt/files/virtlogd.init-r1 deleted file mode 100644 index ff9c2446e8c3..000000000000 --- a/app-emulation/libvirt/files/virtlogd.init-r1 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="libvirt virtual machine logging manager" -command="/usr/sbin/virtlogd" -command_args="-d" -pidfile="/run/virtlogd.pid" - -extra_started_commands="reload" -description_reload="re-exec the daemon, while maintaining open connections" - - -depend() { - after ntp-client ntpd nfs nfsmount corosync -} - -reload() { - ebegin "re-exec() virtlogd" - - start-stop-daemon --signal SIGUSR1 \ - --exec "${command}" --pidfile "${pidfile}" -} diff --git a/app-emulation/libvirt/libvirt-6.0.0-r3.ebuild b/app-emulation/libvirt/libvirt-6.0.0-r3.ebuild deleted file mode 100644 index 93f45ac0a1cc..000000000000 --- a/app-emulation/libvirt/libvirt-6.0.0-r3.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" - SRC_URI="" - KEYWORDS="amd64 x86" - SLOT="0" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" - SLOT="0/${PV}" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" -LICENSE="LGPL-2.1" -IUSE=" - apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi - iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz - parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa - virtualbox virt-network wireshark-plugins xen zfs -" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - policykit? ( dbus ) - qemu? ( libvirtd ) - vepa? ( macvtap ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -# 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 - policykit? ( acct-group/libvirt ) - app-misc/scrub - >=dev-libs/glib-2.48.0 - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - net-libs/libtirpc - net-libs/rpcsvc-proto - >=net-misc/curl-7.18.0 - sys-apps/dmidecode - >=sys-apps/util-linux-2.17 - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dbus? ( sys-apps/dbus ) - dtrace? ( dev-util/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:0= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( net-libs/libssh ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) - lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) - 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[-device-mapper-only(-)] - ) - pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( - >=app-emulation/qemu-1.5.0 - dev-libs/yajl - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( - >=app-emulation/xen-4.6.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/udev - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs )" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch - "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch - "${FILESDIR}"/${PN}-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch -) - -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 macvtap && CONFIG_CHECK+=" - ~MACVTAP" - - 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 - ~IP_NF_TARGET_MASQUERADE - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - # 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" - - # Handle specific kernel versions for different features - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" - if kernel_is ge 3 6; then - CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " - kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " - fi - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi -} - -src_prepare() { - touch "${S}/.mailmap" - - default - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" - - eautoreconf -} - -my_src_configure() { - local myeconfargs=( - $(use_with apparmor) - $(use_with apparmor apparmor-profiles) - $(use_with audit) - $(use_with caps capng) - $(use_with dbus) - $(use_with dtrace) - $(use_with firewalld) - $(use_with fuse) - $(use_with glusterfs) - $(use_with glusterfs storage-gluster) - $(use_with iscsi storage-iscsi) - $(use_with iscsi-direct storage-iscsi-direct) - $(use_with libvirtd) - $(use_with libssh) - $(use_with lvm storage-lvm) - $(use_with lvm storage-mpath) - $(use_with lxc) - $(use_with macvtap) - $(use_enable nls) - $(use_with numa numactl) - $(use_with numa numad) - $(use_with openvz) - $(use_with parted storage-disk) - $(use_with pcap libpcap) - $(use_with phyp) - $(use_with policykit polkit) - $(use_with qemu) - $(use_with qemu yajl) - $(use_with rbd storage-rbd) - $(use_with sasl) - $(use_with selinux) - $(use_with udev) - $(use_with vepa virtualport) - $(use_with virt-network network) - $(use_with wireshark-plugins wireshark-dissector) - $(use_with xen libxl) - $(use_with zfs storage-zfs) - - --without-hal - --without-netcf - --without-sanlock - - --with-esx - --with-init-script=systemd - --with-qemu-group=$(usex caps qemu root) - --with-qemu-user=$(usex caps qemu root) - --with-remote - --with-storage-fs - --with-vmware - - --disable-static - --disable-werror - - --localstatedir=/var - --with-runstatedir=/run - --enable-dependency-tracking - ) - - if use virtualbox && has_version app-emulation/virtualbox-ose; then - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) - else - myeconfargs+=( $(use_with virtualbox vbox) ) - fi - - econf "${myeconfargs[@]}" -} - -my_src_test() { - # remove problematic tests, bug #591416, bug #591418 - sed -i -e 's#commandtest$(EXEEXT) # #' \ - -e 's#virfirewalltest$(EXEEXT) # #' \ - -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ - -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ - tests/Makefile - - export VIR_TEST_DEBUG=1 - HOME="${T}" emake check -} - -my_src_install() { - emake DESTDIR="${D}" \ - SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install - - find "${D}" -name '*.la' -delete || die - - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run - - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r1" 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_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml - fi -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild index 9e26e773524c..8bda7f2f1195 100644 --- a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" SRC_URI="" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 arm64 x86" SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz" diff --git a/app-emulation/libvirt/libvirt-6.1.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.5.0.ebuild index 305df5436e36..f236af9bf3a6 100644 --- a/app-emulation/libvirt/libvirt-6.1.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-6.5.0.ebuild @@ -10,8 +10,6 @@ inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any- if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" - SRC_URI="" - KEYWORDS="" SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz" @@ -20,7 +18,7 @@ else fi DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" +HOMEPAGE="https://www.libvirt.org/" LICENSE="LGPL-2.1" IUSE=" apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi @@ -77,7 +75,6 @@ RDEPEND=" iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) - lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 @@ -125,9 +122,9 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-6.1.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-6.5.0-do-not-use-sysconfig.patch ) pkg_setup() { @@ -219,7 +216,7 @@ src_prepare() { default # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die + 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" @@ -328,8 +325,8 @@ my_src_install() { newinitd "${S}/libvirtd.init" libvirtd newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd + 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 diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 7325bbb67914..45138117ee27 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) -inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd +inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd if [[ ${PV} = *9999* ]]; then inherit git-r3 @@ -20,7 +20,7 @@ else fi DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" +HOMEPAGE="https://www.libvirt.org/" LICENSE="LGPL-2.1" IUSE=" apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi @@ -124,7 +124,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-6.2.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch ) @@ -220,79 +219,68 @@ src_prepare() { 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" - - eautoreconf } -my_src_configure() { - local myeconfargs=( - $(use_with apparmor) - $(use_with apparmor apparmor-profiles) - $(use_with audit) - $(use_with caps capng) - $(use_with dbus) - $(use_with dtrace) - $(use_with firewalld) - $(use_with fuse) - $(use_with glusterfs) - $(use_with glusterfs storage-gluster) - $(use_with iscsi storage-iscsi) - $(use_with iscsi-direct storage-iscsi-direct) - $(use_with libvirtd) - $(use_with libssh) - $(use_with lvm storage-lvm) - $(use_with lvm storage-mpath) - $(use_with lxc) - $(use_with macvtap) - $(use_enable nls) - $(use_with numa numactl) - $(use_with numa numad) - $(use_with openvz) - $(use_with parted storage-disk) - $(use_with pcap libpcap) - $(use_with policykit polkit) - $(use_with qemu) - $(use_with qemu yajl) - $(use_with rbd storage-rbd) - $(use_with sasl) - $(use_with selinux) - $(use_with udev) - $(use_with vepa virtualport) - $(use_with virt-network network) - $(use_with wireshark-plugins wireshark-dissector) - $(use_with xen libxl) - $(use_with zfs storage-zfs) - - --without-hal - --without-netcf - --without-sanlock - - --with-esx - --with-init-script=systemd - --with-qemu-group=$(usex caps qemu root) - --with-qemu-user=$(usex caps qemu root) - --with-remote - --with-storage-fs - --with-vmware - - --disable-static - --disable-werror - - --localstatedir=/var - --with-runstatedir=/run - --enable-dependency-tracking +src_configure() { + local emesonargs=( + $(meson_feature apparmor) + $(meson_use apparmor apparmor_profiles) + $(meson_feature audit) + $(meson_feature caps capng) + $(meson_feature dbus) + $(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 lvm storage_lvm) + $(meson_feature lvm storage_mpath) + $(meson_feature lxc driver_lxc) + $(meson_feature macvtap) + $(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 yajl) + $(meson_feature rbd storage_rbd) + $(meson_feature sasl) + $(meson_feature selinux) + $(meson_feature udev) + $(meson_feature vepa virtualport) + $(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) + + -Dhal=disabled + -Dnetcf=disabled + -Dsanlock=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" + -Drunstatedir="${EPREFIX}/run" ) - if use virtualbox && has_version app-emulation/virtualbox-ose; then - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) - else - myeconfargs+=( $(use_with virtualbox vbox) ) - fi - - econf "${myeconfargs[@]}" + meson_src_configure } -my_src_test() { +src_test() { # remove problematic tests, bug #591416, bug #591418 sed -i -e 's#commandtest$(EXEEXT) # #' \ -e 's#virfirewalltest$(EXEEXT) # #' \ @@ -301,14 +289,11 @@ my_src_test() { tests/Makefile export VIR_TEST_DEBUG=1 - HOME="${T}" emake check + meson_src_test } -my_src_install() { - emake DESTDIR="${D}" \ - SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install - - find "${D}" -name '*.la' -delete || die +src_install() { + meson_src_install # Remove bogus, empty directories. They are either not used, or # libvirtd is able to create them on demand diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml index 920d0228defa..84e2bb8fc48d 100644 --- a/app-emulation/libvirt/metadata.xml +++ b/app-emulation/libvirt/metadata.xml @@ -48,9 +48,6 @@ Support management of VirtualBox virtualisation (one of <pkg>app-emulation/virtualbox</pkg> or <pkg>app-emulation/virtualbox-bin</pkg>) </flag> - <flag name="phyp"> - Support IBM HMC / IVM hypervisor via PHYP protocol - </flag> <!-- Miscellaneous flags --> <flag name="apparmor">Enable AppArmor support</flag> <flag name="dtrace">Enable dtrace support via <pkg>dev-util/systemtap</pkg></flag> |