diff options
Diffstat (limited to 'app-emulation/libvirt')
-rw-r--r-- | app-emulation/libvirt/Manifest | 13 | ||||
-rw-r--r-- | app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch | 78 | ||||
-rw-r--r-- | app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch (renamed from app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch) | 162 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-4.1.0-r3.ebuild | 383 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-4.3.0.ebuild | 4 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-4.4.0.ebuild (renamed from app-emulation/libvirt/libvirt-4.2.0.ebuild) | 3 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-9999.ebuild | 17 |
7 files changed, 99 insertions, 561 deletions
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index f1b8586a3dbd..6e64089a08f7 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -2,9 +2,8 @@ AUX README.gentoo-r2 2094 BLAKE2B ccfad63217f7778e97d8de49e20002dffefff32562f560 AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 BLAKE2B e796f4e32f00e8970eabf723520601b26c7fa5f7579d538299538632ba036dafbb2dc64ad40d10152c0637043b2a649e1dc08468d1f250e00ee0af095d94a093 SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588 AUX libvirt-3.1.0-musl-fix-includes.patch 221 BLAKE2B 65f486f4055c0ccae59601970d770f23f570f127ba26ce1d932855e784b83fce99389f22f12630005be61e5de2e64e0125d0bf5270024f736fe597fa5b81ff78 SHA512 876c7dacedcce1d69938779b978b3a23b2f51128f121b4aa53f5f301d7740f90d77f335523210ed492b68b5f7a0b864b25a694ee562fb5e8ab1b6411d3da48e7 AUX libvirt-3.10.0-r2-fix_paths_for_apparmor.patch 2730 BLAKE2B ae92a37cdfb929862bd58d1cd208e3f8a3aab10dae98ec8e51d6c3ab579295e3f59ff091970499c6c57b625edec77b98421502df625b1d10c1c3d0be3dfbe489 SHA512 751b971fd0f109f3a4147feea8481adb9c868313ea57d293a89ee548661514f124318324823d9380839a7a5c8ae7c1e3ae8c4c6e62027587f163c8856e353a6a -AUX libvirt-4.1.0-do_not_use_sysconf.patch 6867 BLAKE2B 3105dd0ff7c0275f1edb279acd2674f76029bdcb3649f4564d0b57e202b4353d9fca7bd1e98e2fb5ad9e2acafd5616f693058150f6696d00fe4a22d7374bf35a SHA512 a38061d6f9d100f40f429c1b4f5c0a1fe480c412ff9a59aa6c53c22809c88892928aae265e91b5561c02ef29aa075aa68f6e4f2f33bb24045ca82b2ec85087d7 -AUX libvirt-4.1.0-unbreak_my_bridge.patch 2881 BLAKE2B 19110dc2a78fded57d952a5044022d1788aab77ddf3b35d0bea3c064b5000afa7d801d0252c9b44b7632bf3ce6fbd8a8d1c86ac121c5da0095d16a63ba35f78b SHA512 c27614fd652196da2261438aa28e4cf7369d1e54f589815644501e93a6a02d997e1b845ac0fa461c6fb2f6c915441602b22361bfa2109e67280767370517673c AUX libvirt-4.2.0-do_not_use_sysconf.patch 6651 BLAKE2B 1863ad6d83e0e3749f506792d8d1fc3a530e4b203c60b1530b6c00727e96441200b25261f2774bea35ac3975498a3ecdad95aff9e026e6aa0da117411c3c2e34 SHA512 8db31a568a41bf76339bb33076aec40b6d485f5b71a94030fc322013d1e7fac717f6d7abdd17729aaede132baf6a3b0a99e7ef315c9bf78cc5e9522ff551813a +AUX libvirt-4.5.0-do_not_use_sysconf.patch 7417 BLAKE2B b1e6471a7b6a923a3ca4b630df3ddf31994d3492837e842fd0eb43f79757f2a39652345711719fd2b189116d533472d4e4298520b81838706264d371537d6947 SHA512 1362feb1d2ff3dbb1d5550152453c2fe7fbc4645356a866195601eb17a280af0106753d873285b307267b2c941c18d8db2b5a24d7916a49dfd6af3515217bfcc AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc AUX libvirt-guests.init-r2 5411 BLAKE2B a14ecc1bb7188dbbe3d0f82f301a73b876da2d82475cb38a503ed115e894bc59a0466daec5dd7665b3f0656c84ab58e2ba9f8f52eb54a4f8684094f951659fde SHA512 273bcc248ab659bb0cef12c03187f1445c00d2736912f3b54911137352a48b6fcdc2e0c76c56db984501acc4b9e8c0a4cf453a90947c5e525d0746ac9afa8505 AUX libvirtd.confd-r5 740 BLAKE2B 74a069f4902dd1352f06029c886200615a35870ff88496c91956d23a3172db0789086622422f545498e92b7f8de41225022185fe291dd580cbacdeb783163f4b SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91 @@ -13,11 +12,9 @@ AUX libvirtd.service.conf 401 BLAKE2B edd74238f9639ead1d776142e6231d87f39cb6670e AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed AUX virtlockd.init-r1 570 BLAKE2B 734d582d867b79649f863504fcd7c87fe3c59569b56b0996a6229d6eebadc9d4c356c10bbcf5637483fbc930d0c50233da4fffa357d423029b3828b7a3be56de SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5 AUX virtlogd.init-r1 569 BLAKE2B 20df60c23cee575577592d41d1a9913923255633d12de789c036e6085f9e7b4360e017155c61e3688332b493a0e96ffca55753bcc67a33bb877539b80eef81fe SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1 -DIST libvirt-4.1.0.tar.xz 15046956 BLAKE2B e5d4fb47d6308b2f74d464b8a4b236fcda96ca71357847ce7bc9c787e89111ed99538e9f7815287d14af24db1bc774012682843edc1e067cdf710e82d0b349c9 SHA512 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894 -DIST libvirt-4.2.0.tar.xz 15180120 BLAKE2B 0df6caef7f377e627a7ca1d169e1c8032d02fdfb5cc32a3036fbedd021063672114fcef09aa34e7218b56eef0fe64509024fbcd674a0c5f312a7afb9aa3e34a5 SHA512 ced3a7408e95f1663deec03b095780d0f805126506a064a11063d1f313f923eb0ff0ea95f99826514d8cb4e51c850f6f02904e06e5ef8106c38898a0cfe7f9ed DIST libvirt-4.3.0.tar.xz 14667860 BLAKE2B bd4dfbcfba3b11036be979caf938ec7ca4fc04cc4bd6dfd5eec05c054ba4ebf953c0e86a080e65ab8a880f2bcc2f4d018283e870afcb64bd0b750247f3c96357 SHA512 cc61497121931019a8cc3fa8234d7cf95b0f0e1d77ab6fcd089db92759617b099eb83c57aa91768ae6ccf92c345cf72e1d9b202acb5132a159476fb86f1a6999 -EBUILD libvirt-4.1.0-r3.ebuild 9688 BLAKE2B 7990f26444badc344ffc9faab1d55c2accc06709d02e8318d37b9975035494b0e971e272ee0482b0c756a2cfed92699bbdc323e2f13dcd24041c3d15949b1a25 SHA512 5dcfa2c9118eb07f0732ea3ecb6af40fb4517300efd1cc2e1f36efc682469a7b97eb08dfae552e34cc93e58a297c5ed652f0eb99b7047ae3b3976490e929c045 -EBUILD libvirt-4.2.0.ebuild 9628 BLAKE2B 74587b56782f61502d0bb78e1517417bdc90951d6591e6b59e55cf1f346e8d903a2efc089094d51ba7585afeb44094b3c32fde19cb869c6be240717d870e2b52 SHA512 5329a60f625950e012d1f60a29b2f3b82757f023bd375639e54c87065e07fc47c6e8ff14e8afd4be978c25aa8905aae6f5a6e850c86bc4c2f03f4fa9adea7856 -EBUILD libvirt-4.3.0.ebuild 9635 BLAKE2B a9818c549ff4df48ec3284151d9e25efaf676789a1fa0980620116fcec2bcf44b5f208f864bd5a04bbd110d03fa16ed70b06d803c2e81abb7c5654665f8313b1 SHA512 c6b9a313917e0dba1530e6d0f9ebb2c3268465fc95cb39e77cdea225987aec6e228039b5c570b709c54c572d41665a4b777e15e3d85d75eb7a454249e40b1954 -EBUILD libvirt-9999.ebuild 9845 BLAKE2B 6088d0682f657ce4b8137c7dbe28f325eb3814519383958cc558db8a0e8433d4f3c73a688174d6c9bf02d67d5f1e23f8951093d67288d24e89ce13a7d907cec7 SHA512 a895edde185daea93df3e1ffcd193724c796b72ee7eb6a8f4054c894ae8b14a91b45018eb0b0ee2b039d74a47be31ee95188fc0766552605d8bcdec6bc04b568 +DIST libvirt-4.4.0.tar.xz 14668912 BLAKE2B 04f7a48618924bb8bbe1621572d260a01626687c66ed45d1a08d745210fc522fba63387a0433c0c55e41a5655267c094c16b7ff97f9e45b17419dfc83f465c79 SHA512 725b9b093a2aaeab6fdcb8df341a400ab363bcd50af8400dfd0593c41d8fbc8352f89147be9fbfde2e8418cc7298e090fe07ec7255b0aff1f0d001b93322f93f +EBUILD libvirt-4.3.0.ebuild 9632 BLAKE2B b0be47e818c2b2eff6e6021062d049a611c4bde84c568054621bfa5971bb98d6d75576fc4aba5df325c1ba09290f0bfb73da70578cfa0629f0515ea1d6fbb275 SHA512 2a22bb86670e409836e5c37d846c887c16a82f17f6241c2b5a15da4dbe6e19a68894b2cf2704a90aa8c827faee6afce3c9cb3d2870b7f7d532a060677cb53f9a +EBUILD libvirt-4.4.0.ebuild 9569 BLAKE2B a43b47e0b437f9e9ab4d200c3c0b7e11171212788a888a60945445e686badf99bb4c7a52f81fce00c92557492070088189f79d3028819339ccd91ee1f9618719 SHA512 6a599f3d1b1e4fa39e571ff31c46bd2aac6bdc2a0f1b40499c4fee932164008889d15976f351cebc912dd57b1a97044e6239add955fd9611b13f4585d8cee357 +EBUILD libvirt-9999.ebuild 9569 BLAKE2B 9c8e8e534e5745004276c4932c760d79f037d21ebf62a7865593c8dac3aa29da3cd493e2987931bd6cb0eb6c559ca44bcaafec35f398f06f71fbfadf1ef51a3d SHA512 9dc3847a2873f2ac7f8ac8d5122caf2513df7b4c253a1e28b22c62247ce7aba5913167b9e47eee6be5e34c08ee4c88fe2a458e0be9c5a8e49c5f99873ede6375 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed diff --git a/app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch b/app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch deleted file mode 100644 index c4d24ec020b1..000000000000 --- a/app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch +++ /dev/null @@ -1,78 +0,0 @@ -[PATCH] conf: avoid reporting errors when network driver is disabled - -In previous releases all these methods were a no-op if the network -driver is disabled. These helper methods are called unconditionally for -all types of network interface, so must be no-ops if missing. Other code -will already generate an error if the network driver is disabled and a -NIC with type=network is used. - -Signed-off-by: Daniel P. Berrangé <berrange redhat com> ---- - src/conf/domain_conf.c | 23 +++++++++-------------- - 1 file changed, 9 insertions(+), 14 deletions(-) - -diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c -index c8d051fa9f..79d6bd378e 100644 ---- a/src/conf/domain_conf.c -+++ b/src/conf/domain_conf.c -@@ -28979,10 +28979,13 @@ int - virDomainNetAllocateActualDevice(virDomainDefPtr dom, - virDomainNetDefPtr iface) - { -+ /* Just silently ignore if network driver isn't present. If something -+ * has tried to use a NIC with type=network, other code will already -+ * cause an error. This ensures type=bridge doesn't break when -+ * network driver is compiled out. -+ */ - if (!netAllocate) { -- virReportError(VIR_ERR_NO_SUPPORT, "%s", -- _("Network device allocation not available")); -- return -1; -+ return 0; - } - - return netAllocate(dom, iface); -@@ -28993,8 +28996,6 @@ virDomainNetNotifyActualDevice(virDomainDefPtr dom, - virDomainNetDefPtr iface) - { - if (!netNotify) { -- virReportError(VIR_ERR_NO_SUPPORT, "%s", -- _("Network device notification not available")); - return; - } - -@@ -29007,9 +29008,7 @@ virDomainNetReleaseActualDevice(virDomainDefPtr dom, - virDomainNetDefPtr iface) - { - if (!netRelease) { -- virReportError(VIR_ERR_NO_SUPPORT, "%s", -- _("Network device release not available")); -- return -1; -+ return 0; - } - - return netRelease(dom, iface); -@@ -29020,9 +29019,7 @@ virDomainNetBandwidthChangeAllowed(virDomainNetDefPtr iface, - virNetDevBandwidthPtr newBandwidth) - { - if (!netBandwidthChangeAllowed) { -- virReportError(VIR_ERR_NO_SUPPORT, "%s", -- _("Network device bandwidth change query not available")); -- return -1; -+ return 0; - } - - return netBandwidthChangeAllowed(iface, newBandwidth); -@@ -29033,9 +29030,7 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr iface, - virNetDevBandwidthPtr newBandwidth) - { - if (!netBandwidthUpdate) { -- virReportError(VIR_ERR_NO_SUPPORT, "%s", -- _("Network device bandwidth update not available")); -- return -1; -+ return 0; - } - - return netBandwidthUpdate(iface, newBandwidth); --- -2.14.3 diff --git a/app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch index 2c8339a8b519..3e430cba1d2f 100644 --- a/app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch +++ b/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch @@ -1,17 +1,34 @@ +From a365e2d5b4af1ab2be743773412fe265579a9a0b Mon Sep 17 00:00:00 2001 +Message-Id: <a365e2d5b4af1ab2be743773412fe265579a9a0b.1529989118.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +Date: Tue, 26 Jun 2018 06:51:06 +0200 +Subject: [PATCH] gentoo: do not use sysconf + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + src/Makefile.am | 29 ++++++----------------------- + src/locking/virtlockd.service.in | 3 +-- + src/logging/virtlogd.service.in | 3 +-- + src/remote/libvirtd.service.in | 3 +-- + tools/Makefile.am | 17 ++++------------- + tools/libvirt-guests.service.in | 2 +- + tools/libvirt-guests.sysconf | 7 +++++++ + 7 files changed, 21 insertions(+), 43 deletions(-) + diff --git a/src/Makefile.am b/src/Makefile.am -index 3bf2da5..6b3f37a 100644 +index db8c8ebd1a..63d7a9ca46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -2165,23 +2165,6 @@ EXTRA_DIST += \ - $(SYSCONF_FILES) \ - $(NULL) +@@ -757,23 +757,6 @@ endif WITH_SETUID_RPC_CLIENT + + EXTRA_DIST += $(SYSCONF_FILES) -install-sysconfig: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig - for f in $(SYSCONF_FILES:%.sysconf=%) ; \ - do \ - tgt=`basename $$f`; \ -- $(INSTALL_SCRIPT) $(srcdir)/$$f.sysconf \ +- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ - $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ - done - @@ -23,11 +40,11 @@ index 3bf2da5..6b3f37a 100644 - done - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : - - SYSVINIT_FILES_IN = \ + SYSVINIT_FILES_IN += \ locking/virtlockd.init.in \ - logging/virtlogd.init.in \ -@@ -2268,14 +2251,14 @@ uninstall-polkit:: - endif ! WITH_POLKIT + $(NULL) +@@ -814,14 +797,14 @@ uninstall-logrotate: + endif ! WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_RED_HAT -install-init:: $(SYSVINIT_FILES) install-sysconfig @@ -43,8 +60,43 @@ index 3bf2da5..6b3f37a 100644 rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(sysconfdir)/rc.d/init.d/%) rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : +@@ -859,14 +842,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) + BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) + DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) + +-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig ++install-systemd: $(SYSTEMD_UNIT_FILES) + $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) + for f in $(SYSTEMD_UNIT_FILES); \ + do \ + $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ + done + +-uninstall-systemd: uninstall-sysconfig ++uninstall-systemd: + rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) + rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : + else ! LIBVIRT_INIT_SCRIPT_SYSTEMD +@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES) + if WITH_LIBVIRTD + if LIBVIRT_INIT_SCRIPT_UPSTART + +-install-upstart: install-sysconfig ++install-upstart: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d + for f in $(UPSTART_FILES:%.upstart=%); \ + do \ +@@ -893,7 +876,7 @@ install-upstart: install-sysconfig + $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ + done + +-uninstall-upstart: uninstall-sysconfig ++uninstall-upstart: + for f in $(UPSTART_FILES:%.upstart=%); \ + do \ + tgt=`basename $$f` ; \ diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index 3c9d587..2449b20 100644 +index 3c9d587032..2449b201d9 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) @@ -58,7 +110,7 @@ index 3c9d587..2449b20 100644 # 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 3d9ae36..4373619 100644 +index 3d9ae36150..43736191d5 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) @@ -72,10 +124,10 @@ index 3d9ae36..4373619 100644 # Loosing the logs is a really bad thing that will # cause the machine to be fenced (rebooted), so make diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 769702e..1830c72 100644 +index 7f689e08a8..239beeced9 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in -@@ -21,8 +21,7 @@ Documentation=https://libvirt.org +@@ -22,8 +22,7 @@ Documentation=https://libvirt.org [Service] Type=notify @@ -86,7 +138,7 @@ index 769702e..1830c72 100644 KillMode=process Restart=on-failure diff --git a/tools/Makefile.am b/tools/Makefile.am -index 85e640b..99b9fa1 100644 +index 1452d984a0..cef08741cb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -336,15 +336,6 @@ install-data-local: install-init install-systemd install-nss \ @@ -116,8 +168,23 @@ index 85e640b..99b9fa1 100644 else ! LIBVIRT_INIT_SCRIPT_RED_HAT install-init: uninstall-init: +@@ -391,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in + SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system + + if LIBVIRT_INIT_SCRIPT_SYSTEMD +-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh ++install-systemd: libvirt-guests.service libvirt-guests.sh + $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) + $(INSTALL_DATA) libvirt-guests.service \ + $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service + +-uninstall-systemd: uninstall-sysconfig ++uninstall-systemd: + 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 491ca62..f0f417b 100644 +index 491ca62138..f0f417bffb 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) @@ -130,7 +197,7 @@ index 491ca62..f0f417b 100644 # out the code ExecStart=@libexecdir@/libvirt-guests.sh start diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -index 08204ca..2da172b 100644 +index 669b046507..45b0b9ea46 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -1,3 +1,10 @@ @@ -142,63 +209,8 @@ index 08204ca..2da172b 100644 + + # URIs to check for running guests - # example: URIS='default xen:/// vbox+tcp://host/system lxc:///' + # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' #URIS=default -diff --git a/src/Makefile.am b/src/Makefile.am -index 6b3f37a..48e7133 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2417,14 +2417,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) - BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) - DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) - --install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig -+install-systemd: $(SYSTEMD_UNIT_FILES) - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - for f in $(SYSTEMD_UNIT_FILES); \ - do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ - done - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : - else ! LIBVIRT_INIT_SCRIPT_SYSTEMD -@@ -2496,7 +2496,7 @@ EXTRA_DIST += $(UPSTART_FILES) - if WITH_LIBVIRTD - if LIBVIRT_INIT_SCRIPT_UPSTART - --install-upstart: install-sysconfig -+install-upstart: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d - for f in $(UPSTART_FILES:%.upstart=%); \ - do \ -@@ -2505,7 +2505,7 @@ install-upstart: install-sysconfig - $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ - done - --uninstall-upstart: uninstall-sysconfig -+uninstall-upstart: - for f in $(UPSTART_FILES:%.upstart=%); \ - do \ - tgt=`basename $$f` ; \ -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 99b9fa1..37e037c 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -382,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in - SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system - - if LIBVIRT_INIT_SCRIPT_SYSTEMD --install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh -+install-systemd: libvirt-guests.service libvirt-guests.sh - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) libvirt-guests.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: - +-- +2.16.4 + diff --git a/app-emulation/libvirt/libvirt-4.1.0-r3.ebuild b/app-emulation/libvirt/libvirt-4.1.0-r3.ebuild deleted file mode 100644 index a033deaacb09..000000000000 --- a/app-emulation/libvirt/libvirt-4.1.0-r3.ebuild +++ /dev/null @@ -1,383 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completion-r1 - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt.git" - SRC_URI="" - KEYWORDS="amd64" - SLOT="0" -else - # Versions with 4 numbers are stable updates: - if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then - SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz" - else - SRC_URI="http://libvirt.org/sources/${P}.tar.xz" - fi - KEYWORDS="amd64 ~arm64 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 firewalld fuse glusterfs iscsi +libvirtd lvm - libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit - +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network - wireshark-plugins xen zeroconf zfs -" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - policykit? ( dbus ) - qemu? ( libvirtd ) - uml? ( 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=" - app-misc/scrub - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - || ( >=net-analyzer/netcat6-1.0-r2 >=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 ) - firewalld? ( net-firewall/firewalld ) - fuse? ( >=sys-fs/fuse-2.8.6:= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - libssh? ( net-libs/libssh ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) - 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-0.13.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 - app-emulation/xen-tools:= - ) - udev? ( - virtual/udev - >=x11-libs/libpciaccess-0.10.9 - ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) - zfs? ( sys-fs/zfs )" - -DEPEND="${RDEPEND} - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-4.1.0-do_not_use_sysconf.patch - "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch - "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488 - "${FILESDIR}"/${P}-unbreak_my_bridge.patch # bug 650660 -) - -pkg_setup() { - if use qemu; then - enewgroup qemu 77 - enewuser qemu 77 -1 -1 "qemu,kvm" - fi - - use policykit && enewgroup libvirt - - # 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" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~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 - - if [[ ${PV} = *9999* ]]; then - # git checkouts require bootstrapping to create the configure script. - # Additionally the submodules must be cloned to the right locations - # bug #377279 - ./bootstrap || die "bootstrap failed" - ( - git submodule status | sed 's/^[ +-]//;s/ .*//' - git hash-object bootstrap.conf - ) >.git-module-status - fi - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \ - -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ - -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with apparmor) - $(use_with apparmor apparmor-profiles) - $(use_with audit) - $(use_with caps capng) - $(use_with dbus) - $(use_with firewalld) - $(use_with fuse) - $(use_with glusterfs) - $(use_with glusterfs storage-gluster) - $(use_with iscsi storage-iscsi) - $(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 uml) - $(use_with vepa virtualport) - $(use_with virt-network network) - $(use_with wireshark-plugins wireshark-dissector) - $(use_with xen) - $(use_with xen xen-inotify) - $(use_with xen libxl) - $(use_with zeroconf avahi) - $(use_with zfs storage-zfs) - - --without-hal - --without-netcf - --without-sanlock - --without-xenapi - - --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 - - --with-html-subdir=${PF}/html - --localstatedir=/var - ) - - 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[@]}" - - if [[ ${PV} = *9999* ]]; then - # Restore gnulib's config.sub and config.guess - # bug #377279 - (cd .gnulib && git reset --hard > /dev/null) - fi -} - -src_test() { - cd "${BUILD_DIR}" - - # 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 || die "tests failed" -} - -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 - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - - newbashcomp "${S}/tools/bash-completion/vsh" vsh - bashcomp_alias vsh virsh virt-admin - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") - 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-4.3.0.ebuild b/app-emulation/libvirt/libvirt-4.3.0.ebuild index 7c7d4531c3ec..354a95ce8987 100644 --- a/app-emulation/libvirt/libvirt-4.3.0.ebuild +++ b/app-emulation/libvirt/libvirt-4.3.0.ebuild @@ -7,9 +7,9 @@ inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completio if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt.git" + EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" SRC_URI="" - KEYWORDS="amd64 x86" + KEYWORDS="" SLOT="0" else # Versions with 4 numbers are stable updates: diff --git a/app-emulation/libvirt/libvirt-4.2.0.ebuild b/app-emulation/libvirt/libvirt-4.4.0.ebuild index d93ae1d82cad..708c9658be8a 100644 --- a/app-emulation/libvirt/libvirt-4.2.0.ebuild +++ b/app-emulation/libvirt/libvirt-4.4.0.ebuild @@ -7,7 +7,7 @@ inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completio if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt.git" + EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" SRC_URI="" KEYWORDS="" SLOT="0" @@ -125,7 +125,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch - "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488 ) pkg_setup() { diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 21cd6af1aa34..70f3603bfcb8 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -7,7 +7,7 @@ inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completio if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt.git" + EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" SRC_URI="" KEYWORDS="" SLOT="0" @@ -122,7 +122,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch + "${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch ) @@ -237,12 +237,6 @@ src_prepare() { } src_configure() { - # - # With 4.1.0 we should always enable networking support - otherwise not - # even minimal networking is available. Yes, this degrades - # USE=virt-network to a mere runtime-dep USE flag. But let's keep it - # for compatibility and convenience. - # local myeconfargs=( $(use_with apparmor) $(use_with apparmor apparmor-profiles) @@ -276,6 +270,7 @@ src_configure() { $(use_with udev) $(use_with uml) $(use_with vepa virtualport) + $(use_with virt-network network) $(use_with wireshark-plugins wireshark-dissector) $(use_with xen) $(use_with xen xen-inotify) @@ -283,8 +278,6 @@ src_configure() { $(use_with zeroconf avahi) $(use_with zfs storage-zfs) - --with-network - --without-hal --without-netcf --without-sanlock @@ -343,9 +336,7 @@ src_install() { # 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/cache - rm -rf "${D}"/var/run - rm -rf "${D}"/var/log + rm -rf "${D}"/var use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! |