From 7517a33ee0eeb56b36f831e02aec1571a8bb0f7a Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 27 Jan 2015 10:42:55 +0000 Subject: [PATCH] version bump; cleanup; apply security fix for 1.2.11 and drop vulnerable (CVE-2015-0236) Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xBD3A97A3 --- app-emulation/libvirt/ChangeLog | 15 +- app-emulation/libvirt/Manifest | 40 +- .../files/libvirt-1.2.10-cve-2014-7823.patch | 73 --- .../libvirt-1.2.10-cve-2014-8131-part2.patch | 38 -- .../files/libvirt-1.2.10-cve-2014-8131.patch | 75 --- .../libvirt/libvirt-1.2.10-r3.ebuild | 15 +- ....11-r2.ebuild => libvirt-1.2.11-r3.ebuild} | 13 +- app-emulation/libvirt/libvirt-1.2.12.ebuild | 462 ++++++++++++++++++ app-emulation/libvirt/libvirt-9999.ebuild | 13 +- 9 files changed, 524 insertions(+), 220 deletions(-) delete mode 100644 app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-7823.patch delete mode 100644 app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-8131-part2.patch delete mode 100644 app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-8131.patch rename app-emulation/libvirt/{libvirt-1.2.11-r2.ebuild => libvirt-1.2.11-r3.ebuild} (96%) create mode 100644 app-emulation/libvirt/libvirt-1.2.12.ebuild diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index f925611db67c..8167d460dc53 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-emulation/libvirt -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.411 2014/12/24 15:05:04 tamiko Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.412 2015/01/27 10:42:52 tamiko Exp $ + +*libvirt-1.2.12 (27 Jan 2015) +*libvirt-1.2.11-r3 (27 Jan 2015) + + 27 Jan 2015; Matthias Maier +libvirt-1.2.11-r3.ebuild, + +libvirt-1.2.12.ebuild, -files/libvirt-1.2.10-cve-2014-7823.patch, + -files/libvirt-1.2.10-cve-2014-8131-part2.patch, + -files/libvirt-1.2.10-cve-2014-8131.patch, -libvirt-1.2.11-r2.ebuild, + libvirt-1.2.10-r3.ebuild, libvirt-9999.ebuild: + version bump; cleanup; apply security fix for 1.2.11 and drop vulnerable + (CVE-2015-0236) 24 Dec 2014; Matthias Maier -libvirt-1.2.10-r2.ebuild: drop vulnerable, bug #533286, CVE-2014-8135, CVE-2014-8136 diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index f41145b38065..2655cfe62dbd 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,9 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX libvirt-1.2.10-cve-2014-7823.patch 3066 SHA256 f5574d5b7f02700bd81596b451896163c8dcb1081d568338ed9810dbe0d759ef SHA512 1a13c0fd39671e417b7c338a4d4cada52c83527e726f23a59fb31b3f0777eec3b901761e7a62f07abec0968482a0410c0b28a145290755d68ea02f0b497d981c WHIRLPOOL 8ff93c91d1ab972cf46d90feb9b196e9b0516c3646809448660d200d7fbd205e9507323e63e9afd299ac7393d43f90ff7b1be2fc74ba8f5f64ce6c9ab37a3827 -AUX libvirt-1.2.10-cve-2014-8131-part2.patch 1413 SHA256 c2217f14db504f0366f06db091c5c2d7a433198606a25b0dd791d3b145b4dfdc SHA512 b745c7f62e300433d77785b5a5a66a5584a86a9387d6c2f09493e902f71a62fdc04809fee00ededa948576faff38f529410b53a8228f3a25008e69ece4ea57c2 WHIRLPOOL 07413bbbb743be2965270c08388a405fe6869530169721028de64d588d3d78ca2950ede8dd6438761755ac4d89069b6b87c7c9f8049ec418fba7ee81a8e9d6f7 -AUX libvirt-1.2.10-cve-2014-8131.patch 2761 SHA256 1ecbb82ee50dfb91361cb2f55d1dc8e014e08223258dad2a1183d5d844cd7d62 SHA512 36913fbab2ad6499e0386765c106e3592348a77fb8cf10c74353be6299de4a1740a336a2b98efbceed982725cb688f6110e435a4033d9d7141031262a12e0da9 WHIRLPOOL a750d5025385f956a66a177e90332c0f19f7be6097d75bb7b5a2b050a893b0e4638dd1edc04f92219727fa3e069c4e6349ce52cd007472186c72f8c400b107ab AUX libvirt-1.2.9-do_not_use_sysconf.patch 3879 SHA256 1a0c0b29c481097ee218cc752b11f00193a87a010feefc71ea3f56e041c5844d SHA512 cd8881ed2fd928e4fc122a8615fc328f515181129253cba1124c1faf48549729428113822b56034143e192c44944b1a40e83b960f742db64738e5bc05b9bb371 WHIRLPOOL 9413e40883d98d5d78a2c269786a2f640ec9689744ef431a4e9a092d251d33deda954ad8631520a04a16d8c30ca2e9b28bc8b78562f27267f80740901907a253 AUX libvirt-1.2.9-fix-firewalld-configuration.patch 1069 SHA256 0a4116d91fa068e42735624b78b8fa763f7ee251480151033219981ed11a0c4f SHA512 99addf602f9551e7c2dd92d62d9c3170402d3028dee4f4e8f6809c58cbb2c15d971b518ddc83f2688e0e234194e14156c531eb2ceb0cf2b1740dbb5b099b54ed WHIRLPOOL 7d904c54eb2d98cc446700d1e21ab13080c8bd212122fe5dac91882d564b8453c2ea1e509e8b8995c03623f19d6555b8d126cf0e363e062d2ede93ec12cfcda8 AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3 @@ -13,26 +10,29 @@ AUX libvirtd.service.conf 401 SHA256 1cfb6f7dec5746364d9a4cccddb4b63f8ccd0ebf8bf AUX virtlockd.init 437 SHA256 0894a839f85dff6f97bde514437935f4c1589ba4f2cbd3e0efe28753698694a1 SHA512 3d7b366736fb98acd26577e29a3c00592e7be038634fc3b51891f557426cd9945bf08a4486f1d62aa91ce7dc7d6bf96d7e57ef06a3a0b4aceb55b9e9c9e9b2da WHIRLPOOL d633a1a7358dbf7bd94d70f44753c9c346adfc78537643e5f379cea017d20e1097998ecfaf87e47e4e0f9216d43a3053af24e3129ecfb8f110f5283a769f368f DIST libvirt-1.2.10-20141223.tar.xz 5012 SHA256 a1d31d12f04631e46748b6dfc6893d20127bd97204415c9642b1af68077d68b4 SHA512 70148beb288d0df468bd3c82b42da1ccae54f4914514f7bd9817a4aa6e6bb54d21aba58ce9ab6cb35ec539af8c6ce9f5c2f91f1a67f29824bcf0a13e6c1a2975 WHIRLPOOL 0569ad4b4222f968684ab2e108bd761bdb750eb59348e70c38ebc809a9ee0cb74445126d2517f5b660a5600d4de9c20d3f3d7f96abff1cc9d3e2b5a834fc87f4 DIST libvirt-1.2.10.tar.gz 30029503 SHA256 5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e SHA512 9cd5d2a604769cf70e388c367abcde27ee8d6d7043227f17dd2cac92a467ea06547374e1d83c7b1ee4c5322d8b3d9e4cbb6db373efae5eaaceed1b1376cbd09d WHIRLPOOL 986c1fd0128101f936897c97a36d646b8893d9ee0a223d05b004d73408a2720aeb9bb5fe3e4a7c476947021b89d955fb4a1b3a64dfe8dfe0d30dbfe75487b8fe +DIST libvirt-1.2.11-20150127.tar.xz 1248 SHA256 a5ba09f85eb2bbe5f6a727c667777b5bdefe3447c8fe6532ad665368b42a4a1d SHA512 ffe0a8f0c207bdb7ca4d99b77fae9b2653bf37551c182334ad3c60874b5fc8942a6ee31e260da8b832c90c904f9caccc57e4f49651c0cd6e0ed8a7fbfb172c7e WHIRLPOOL 907fb49dc0228bcf0624833d3e27dfe609df8dac9420e014e4d0882edc9f1c8cbca008d24bd072d98c351681b33f167d678d88db96fc939a87ab46f6e7dc72da DIST libvirt-1.2.11.tar.gz 30571605 SHA256 1b886429734a53fc9a201f46d77448fda963e1323246269eb0dcb4c12fb02fcc SHA512 4aaeb2eeb563f0a9105a1586054d69c24dada12ddf9b71edd3742ad602eb8c892d9f615ee1a2159051bec52699897c6707d9d0204b8f0fe61bae15885ee986f2 WHIRLPOOL b64ee58d633e4b3fec52125bd9b582f7d07045baa66c492fd2b6bc521d994cec95fa460c3a8b32a0f73043ad812e36d81832c31046bbacc280fb2f2764e9bd75 -EBUILD libvirt-1.2.10-r3.ebuild 12910 SHA256 4eac551d9554018b4655b90c4922ef77c4ecd60138bed71f2c992f3b59095953 SHA512 75275888371a78891f4397847cbb61c249f66c03e0243edff748a912490ac217f05a2ea0a041122cfbe7c5e70bb055b899a67d07a8463ff1d9434e9f0bbe04f5 WHIRLPOOL b9a984362f41ad84b20985651e94a66087f208b9930c6b4c628b62a52a8d53cc220bc57bd3d98ba80871ac9c99788bce62516bd9411189287d43a8bdef952083 -EBUILD libvirt-1.2.11-r2.ebuild 12679 SHA256 6e4bad045b0c8cf22dfd2a26e3278636fafb6156f447a2b7a531f8a008283d3b SHA512 7e71e2f98d6871f1fd3084aec1783fd59b85b74dd55dd8cc297f8b501a7b3c911930162eab056b65dfd0af75012e6b6d444767d025b6ecea8438af6755f3041f WHIRLPOOL 9c689c6f015179b618ad4e197d5897f4813b7a8d7157c8293e735559a4111652f3b89ae61156dec8e984e8df180ca0935af85dbf1808d1fd54ee5f48dcd5d774 -EBUILD libvirt-9999.ebuild 12695 SHA256 f984980eaec7fa121b5b5d3d9e44c4b8aed1161f88aebe6bcf9514face3b1540 SHA512 9299a530f8160abde0101dc27da8641bd176907a66d2e792f2d3588b5dea61637ef0e64f8ec07bc10508c6c3d60692209a4aefd0e60d2b0a8ba9d152be0fe255 WHIRLPOOL fb4564bb4e2410259cf7f0093edf6b6845e52275047d308645064a262439eb2646e1fff7af97bf30e4c093e766f6b2262404ea0cdcdd2010e15f28074bed052f -MISC ChangeLog 25704 SHA256 005166e3c54d1d8812616c5274ecfd5c7a3525f17f5636e9112f5645f7a8ae65 SHA512 dd470e89b4d17840e4367eb8a7368b8c205d2ba1de84a6d36ae903ecc1eebafaa5004c951d1e7b65433a439c5cf51f073151207d7a0fb5b7c0d7898a6ab05254 WHIRLPOOL d76673341d455ec61b7118b45ecf24064b1ec26d907ee869d5a083bfc421990726e7d0870167f7212e84987cc3ed21faa79ad096199e0d0700eed3c5726e4580 +DIST libvirt-1.2.12.tar.gz 30710487 SHA256 eff5227f774560d97f0b44402a444e821c51e8cd44add89f74bc3c1f4dede66a SHA512 643986d72886fe3de0191b282f561241721a8967911418ff317cecd68e1afb13f32e0aeb5000ae11cc452bfaac6220c472091276c81a69eb569166b87d05e736 WHIRLPOOL 1b02150643145efb851335139661b69999641904c1350c3a1b391efcc7761de7c28ba19307867e21a5c1516da8ab365e01fcdfb542efb56a3cce8ed61be65f0f +EBUILD libvirt-1.2.10-r3.ebuild 12905 SHA256 3c93a3ef108dd5124cf288a8a3298f4f7a616ab7a2ca0f923e8412fd20639f44 SHA512 e09fbc055cc277c3d537982318266a262e47526418f4e192c26d40b45cce30eaa47afbd0b530a63159189ee88e6040d0389ce615a0a03bcb28250717a8dc9c99 WHIRLPOOL d3929af83f9dcfbdbaa8dcadef9cb42258190527fe2bda013ecfd35fcdcfe712f42c1fa2f6a5cbe0c1e49f08bc6b082d63128a59267a2768111b829f70dbca41 +EBUILD libvirt-1.2.11-r3.ebuild 12980 SHA256 4fe76409fc40c43420f0b9dbca9a6d32fbed1623c4a00aa7d2dab126ce65f18c SHA512 c3582840553a7998cf0808e594e9ca128489da9385a41c2bddc16b0255b30ed2d7a3f86f38271395ec01684efb9fe93ba98343dcf26c08a2a5eb5db46e4f38f6 WHIRLPOOL 7d2dbdb1358dd7897df4e0e4cadfc8bf55472d40e082912305fed29d5cd12fef55a20cdba158104f05ea1a609c7b968cbb7f4889662ce68bbdf98b7f7156846a +EBUILD libvirt-1.2.12.ebuild 12989 SHA256 26d9ecd2a0e9c057e706c42006fef4e37a8f84f525ac55a0b3d8a8c8a1051fd2 SHA512 6db15cec2cd1fe545d051ad24060b803207550a8a27074c31c93514125d3cd583f43a65822d4349503d371b9aa502b025669d4cd7d89481b59d889cabdeb6f15 WHIRLPOOL 9b1b23d0d2669bc3bcab31d59bfde8ebf2a162e36f381e08c0617e20b6a40bcb2fef777d552f840f81cee94b3674870415b4e8d8d2ad4869440941daba3ba4e6 +EBUILD libvirt-9999.ebuild 12988 SHA256 98cdb6ef8c4f90d4061d0f2f3747933488103462264de37699072089fb436f9f SHA512 c0d9d4fe8a0156259b21088f32c196946af9f70b5e7004bd60d14ab96fd25d8febbffe394768ea00281b3c7465a6e29c1b3c711648f2daf3b8fb90fcd14d37d3 WHIRLPOOL 1cf5c3669dac38949635459a688ec476f6355dd34fdcf185b50218e673480d59069ba2609af5597579fb2df762a7e03f47721c21661f79e6872403da54a5a253 +MISC ChangeLog 26180 SHA256 7c8c5cfe70761d31f0b992aaa728aebf4318dffdf6c4d30f00ba0c89e25f2a48 SHA512 9c0db507b4cf04f2592c2683d1027ca153e628284979791683898092b1501124e7ff2c28e31ab8d5168469c41ca22d8f81019d3f0fdca077015c4c59582cf7d4 WHIRLPOOL 6be14b5d7999773a5fb153587ba365778af859bfdcc12f7ef7085ec37661e9a66c6eeaf5b6496d256ed0c878c352b5a180c39058d545214a94b2a9c63afb02bc MISC metadata.xml 3604 SHA256 90d98bcf32df9c4ff5d3fc90cdcac46ddc486efa9706b945cbf749d4a1ddcd30 SHA512 35b1fd9faa961efddec324d3721699068b9b2aefb49271f064b3930c9c246a71829f55566438754c34f294db9b8c2ad55386113a72ab11b31cbb604e4afe7816 WHIRLPOOL 6315f8a01134f62a1f7b9845f0e89624bb1edd713b4965a53209b199609ba4f510f0cbb4ee85f348947556cdeee27ab7ae7fcf52b1b9ed82176076d149c00116 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1 -iQIcBAEBCAAGBQJUmtYhAAoJELhOzYlK7nn/4L0QAM4IHgzgVnxUS2Wh7z6+9ZEm -o8XVdNzepF07WXfJ0sV6dBd216N2Tj5PC6hkOd71ruaNCM6Yk+eFWbClQ19VMwsw -EZK8y8hU1siAuyqCqozMTXvmgx+gRsxzrZNPuuds3meIubz+fnTk6KJfKhruY/Bq -/3rpxtQzVIQP8kf5RrryMi/xU7n73rsr4xWOKq5A/hzcAeVuQljzDYEuOiSwIrdI -MKVaTLb5wqaJC1Jd4SD4yQKyKNjg/mkO2dEiEAtRM1R5nbQwcvzG+cndph/hIAbY -1QUN0vOMFrWXaQT1PUdfaHynHPDp6XcKK9wBcPXCMe+YbyXbvRbJCIrHAW0o7pLQ -1zXvNA3krxHfnWLUcguX/QOOO2UiBi7HSNZzjKKmVGkFUDO65DeqUitFyW5JLNdt -fMlXvUiZMo6av5g7hV2t+aYO9/h+u814k5I1IwBdXRR+JpwNpssZ3dg/rwhFk+N0 -4LBCCvFg74YSrFvudZSen2+xNA7gV5hopUJcJZu7jKCkfWzV4xb3JCKagqs5awZS -fRPtdM0/ObXIdDnuhAiDQZlLV+jIqaWyxhREXjC6Ux61GuBXJTeQoxRcvLMWyN9r -9XzusbffpFfr9NX6zN90KSyzbiSak715/Adgl8/GEi9T4VSuw/dFln6L/vcZluHV -RmDSrBqSFGsXfftukg/D -=88xL +iQIcBAEBCAAGBQJUx2utAAoJELhOzYlK7nn/guMQAO3gBLzQV/iqJ0cBDltOWJf6 +gI3UarwvVwShlaqO1A9CVTpDNgp5ZtKRHIMV14D+WRFZI1doVdrZzSTdlP39l4IH +15+9tcP4DQV9m8uqdAQreCdQwwKsa8mGhtIZjEiuC/z1KZefrbl+O0V34cBnpJpW +gtQjluGJPWtsd2Chr/h+v83vDZWV1T/Vi1Ql8vE6i2iu8JdMfL5EfZF2IkX6Ox3C +CXchrql9jZvzZwKlk4VN/2eAIg1yqHD1EmY3ee4t/MEjdHHoqEuCVsO2bg0IwiBA +qz3X87spNzx91ERZ6ZbmD8e/4RgUD7stVVAntIBHTcFN9QRFmwpxQgwzYwPFZ2CG +lf73lFgiywnrKwkPTVR5sqkbYV9whbyjUgxCnr5iaiNdLEZbgePayB0/A4tk2Ds5 +5uR72qhrEUJ7M9nNlPgYXAhiGs+WxrITY3JZjaJH0QhsPb3fEbo941qdiAicNJZ5 +nE50wNmniSL37ucY0XCmkgqXSbnlF8XHP/J/NO3luJ+iW5LjHnkZwSYxA8nbH/Ie +0l1hcAN7oEWoYNq+97xGn3tVFjCTHUMFSB8MniP6fGyqQ6N4OB4Jl3cVOqlsi2Q2 +H89kk3AxCFIxXF6iumEoF6SuRlnR+WprsguoKttveNGqhhfa7j/uAe6cuW2dKxoo +3Mf6dyTI/uIYtf2zoDiG +=iim6 -----END PGP SIGNATURE----- diff --git a/app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-7823.patch b/app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-7823.patch deleted file mode 100644 index c5e6926d1e96..000000000000 --- a/app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-7823.patch +++ /dev/null @@ -1,73 +0,0 @@ -Patch from: https://www.redhat.com/archives/libvir-list/2014-November/msg00114.html - -From: Eric Blake -To: libvir-list redhat com -Subject: [libvirt] [PATCH] CVE-2014-7823: dumpxml: security hole with migratable flag -Date: Wed, 5 Nov 2014 17:30:46 +0100 ---- - -Commit 28f8dfd (v1.0.0) introduced a security hole: in at least -the qemu implementation of virDomainGetXMLDesc, the use of the -flag VIR_DOMAIN_XML_MIGRATABLE (which is usable from a read-only -connection) triggers the implicit use of VIR_DOMAIN_XML_SECURE -prior to calling qemuDomainFormatXML. However, the use of -VIR_DOMAIN_XML_SECURE is supposed to be restricted to read-write -clients only. This patch treats the migratable flag as requiring -the same permissions, rather than analyzing what might break if -migratable xml no longer includes secret information. - -Fortunately, the information leak is low-risk: all that is gated -by the VIR_DOMAIN_XML_SECURE flag is the VNC connection password; -but VNC passwords are already weak (FIPS forbids their use, and -on a non-FIPS machine, anyone stupid enough to trust a max-8-byte -password sent in plaintext over the network deserves what they -get). SPICE offers better security than VNC, and all other -secrets are properly protected by use of virSecret associations -rather than direct output in domain XML. - -* src/remote/remote_protocol.x (REMOTE_PROC_DOMAIN_GET_XML_DESC): -Tighten rules on use of migratable flag. -* src/libvirt-domain.c (virDomainGetXMLDesc): Likewise. - -Signed-off-by: Eric Blake ---- - -The libvirt-security list agreed that this did not need an embargo -because it is low-risk; but I'm on the road this week, so while -this patch for master can go in now, I won't complete the backport -to all the affected stable branches (everything since v1.0.0) or -do the Libvirt Security Notice writeup until Monday. - - src/libvirt-domain.c | 3 ++- - src/remote/remote_protocol.x | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c -index 7dc3146..2b0defc 100644 ---- a/src/libvirt-domain.c -+++ b/src/libvirt-domain.c -@@ -2607,7 +2607,8 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) - virCheckDomainReturn(domain, NULL); - conn = domain->conn; - -- if ((conn->flags & VIR_CONNECT_RO) && (flags & VIR_DOMAIN_XML_SECURE)) { -+ if ((conn->flags & VIR_CONNECT_RO) && -+ (flags & (VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_MIGRATABLE))) { - virReportError(VIR_ERR_OPERATION_DENIED, "%s", - _("virDomainGetXMLDesc with secure flag")); - goto error; -diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x -index db12cda..ebf4530 100644 ---- a/src/remote/remote_protocol.x -+++ b/src/remote/remote_protocol.x -@@ -3255,6 +3255,7 @@ enum remote_procedure { - * @generate: both - * @acl: domain:read - * @acl: domain:read_secure:VIR_DOMAIN_XML_SECURE -+ * @acl: domain:read_secure:VIR_DOMAIN_XML_MIGRATABLE - */ - REMOTE_PROC_DOMAIN_GET_XML_DESC = 14, - --- -1.9.3 - diff --git a/app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-8131-part2.patch b/app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-8131-part2.patch deleted file mode 100644 index 2f8457a94a4e..000000000000 --- a/app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-8131-part2.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cb104ef734dfea12cb8826dba7e2c98912c4b7e1 Mon Sep 17 00:00:00 2001 -From: Francesco Romani -Date: Thu, 11 Dec 2014 08:44:09 +0100 -Subject: [PATCH 17/20] qemu: bulk stats: Fix logic in monitor handling - -A logic bug in qemuConnectGetAllDomainStats makes the code mark the -monitor as available when qemuDomainObjBeginJob fails, instead of when -it succeeds, as the correct flow requires. - -This patch fixes the check and updates the code documentation -accordingly. - -Broken by commit 57023c0a3af4af1c547189c1f6712ed5edeb0c0b. - -Signed-off-by: Francesco Romani ---- - src/qemu/qemu_driver.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index 830fca7..df3ba6d 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -18745,9 +18745,9 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, - } - - if (HAVE_JOB(privflags) && -- qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) < 0) -- /* As it was never requested. Gather as much as possible anyway. */ -+ qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) == 0) - domflags |= QEMU_DOMAIN_STATS_HAVE_JOB; -+ /* else: without a job it's still possible to gather some data */ - - if (qemuDomainGetStats(conn, dom, stats, &tmp, domflags) < 0) - goto endjob; --- -2.0.4 - diff --git a/app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-8131.patch b/app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-8131.patch deleted file mode 100644 index 5ede7efc4ef7..000000000000 --- a/app-emulation/libvirt/files/libvirt-1.2.10-cve-2014-8131.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 57023c0a3af4af1c547189c1f6712ed5edeb0c0b Mon Sep 17 00:00:00 2001 -From: Martin Kletzander -Date: Thu, 27 Nov 2014 15:47:52 +0100 -Subject: [PATCH 11/20] CVE-2014-8131: Fix possible deadlock and segfault in - qemuConnectGetAllDomainStats() - -When user doesn't have read access on one of the domains he requested, -the for loop could exit abruptly or continue and override pointer which -pointed to locked object. - -This patch fixed two issues at once. One is that domflags might have -had QEMU_DOMAIN_STATS_HAVE_JOB even when there was no job started (this -is fixed by doing domflags |= QEMU_DOMAIN_STATS_HAVE_JOB only when the -job was acquired and cleaning domflags on every start of the loop. -Second one is that the domain is kept locked when -virConnectGetAllDomainStatsCheckACL() fails and continues the loop when -it didn't end. Adding a simple virObjectUnlock() and clearing the -pointer ought to do. - -Signed-off-by: Martin Kletzander ---- - src/qemu/qemu_driver.c | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index be37c8f..ae6225b 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -18740,20 +18740,23 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, - privflags |= QEMU_DOMAIN_STATS_HAVE_JOB; - - for (i = 0; i < ndoms; i++) { -- domflags = privflags; - virDomainStatsRecordPtr tmp = NULL; -+ domflags = 0; - - if (!(dom = qemuDomObjFromDomain(doms[i]))) - continue; - - if (doms != domlist && -- !virConnectGetAllDomainStatsCheckACL(conn, dom->def)) -+ !virConnectGetAllDomainStatsCheckACL(conn, dom->def)) { -+ virObjectUnlock(dom); -+ dom = NULL; - continue; -+ } - -- if (HAVE_JOB(domflags) && -+ if (HAVE_JOB(privflags) && - qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) < 0) - /* As it was never requested. Gather as much as possible anyway. */ -- domflags &= ~QEMU_DOMAIN_STATS_HAVE_JOB; -+ domflags |= QEMU_DOMAIN_STATS_HAVE_JOB; - - if (qemuDomainGetStats(conn, dom, stats, &tmp, domflags) < 0) - goto endjob; -@@ -18761,9 +18764,12 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, - if (tmp) - tmpstats[nstats++] = tmp; - -- if (HAVE_JOB(domflags) && !qemuDomainObjEndJob(driver, dom)) { -- dom = NULL; -- continue; -+ if (HAVE_JOB(domflags)) { -+ domflags = 0; -+ if (!qemuDomainObjEndJob(driver, dom)) { -+ dom = NULL; -+ continue; -+ } - } - - virObjectUnlock(dom); --- -2.0.4 - diff --git a/app-emulation/libvirt/libvirt-1.2.10-r3.ebuild b/app-emulation/libvirt/libvirt-1.2.10-r3.ebuild index 373b0658a00c..3aee20a39b44 100644 --- a/app-emulation/libvirt/libvirt-1.2.10-r3.ebuild +++ b/app-emulation/libvirt/libvirt-1.2.10-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.10-r3.ebuild,v 1.3 2014/12/24 13:19:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.10-r3.ebuild,v 1.4 2015/01/27 10:42:52 tamiko Exp $ EAPI=5 @@ -21,14 +21,13 @@ if [[ ${PV} = *9999* ]]; then else # Versions with 4 numbers are stable updates: if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then - SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz - ${BACKPORTS:+ - http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" + SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz" else - SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz - ${BACKPORTS:+ - http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" + SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz" fi + SRC_URI+=" ${BACKPORTS:+ + http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz + http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" KEYWORDS="amd64 x86" SLOT="0/${PV}" fi diff --git a/app-emulation/libvirt/libvirt-1.2.11-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.11-r3.ebuild similarity index 96% rename from app-emulation/libvirt/libvirt-1.2.11-r2.ebuild rename to app-emulation/libvirt/libvirt-1.2.11-r3.ebuild index 861a5323b409..ab770c2696ad 100644 --- a/app-emulation/libvirt/libvirt-1.2.11-r2.ebuild +++ b/app-emulation/libvirt/libvirt-1.2.11-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.11-r2.ebuild,v 1.1 2014/12/18 21:05:55 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.11-r3.ebuild,v 1.1 2015/01/27 10:42:52 tamiko Exp $ EAPI=5 @@ -10,6 +10,8 @@ MY_P="${P/_rc/-rc}" inherit eutils user autotools linux-info systemd readme.gentoo +BACKPORTS="20150127" + if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="git://libvirt.org/libvirt.git" @@ -23,6 +25,9 @@ else else SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz" fi + SRC_URI+=" ${BACKPORTS:+ + http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz + http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" KEYWORDS="~amd64 ~x86" SLOT="0/${PV}" fi @@ -222,6 +227,10 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ + EPATCH_SOURCE="${WORKDIR}/patches" epatch + epatch_user [[ -n ${AUTOTOOLIZE} ]] && eautoreconf diff --git a/app-emulation/libvirt/libvirt-1.2.12.ebuild b/app-emulation/libvirt/libvirt-1.2.12.ebuild new file mode 100644 index 000000000000..4a23953d4ee3 --- /dev/null +++ b/app-emulation/libvirt/libvirt-1.2.12.ebuild @@ -0,0 +1,462 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.12.ebuild,v 1.1 2015/01/27 10:42:52 tamiko Exp $ + +EAPI=5 + +AUTOTOOLIZE=yes + +MY_P="${P/_rc/-rc}" + +inherit eutils user autotools linux-info systemd readme.gentoo + +BACKPORTS="" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://libvirt.org/libvirt.git" + SRC_URI="" + KEYWORDS="" + 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/${MY_P}.tar.gz" + else + SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz" + fi + SRC_URI+=" ${BACKPORTS:+ + http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz + http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" + KEYWORDS="~amd64 ~x86" + SLOT="0/${PV}" +fi +S="${WORKDIR}/${P%_rc*}" + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="http://www.libvirt.org/" +LICENSE="LGPL-2.1" +IUSE="audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc \ + +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \ + selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \ + elibc_glibc systemd" +REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + qemu? ( libvirtd ) + uml? ( libvirtd ) + vepa? ( macvtap ) + virtualbox? ( libvirtd ) + xen? ( libvirtd ) + virt-network? ( libvirtd ) + firewalld? ( virt-network )" + +# 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="sys-libs/readline + sys-libs/ncurses + >=net-misc/curl-7.18.0 + dev-libs/libgcrypt:0 + >=dev-libs/libxml2-2.7.6 + dev-libs/libnl:3 + >=net-libs/gnutls-1.0.25 + net-libs/libssh2 + sys-apps/dmidecode + >=sys-apps/util-linux-2.17 + sys-devel/gettext + >=net-analyzer/netcat6-1.0-r2 + app-misc/scrub + audit? ( sys-process/audit ) + avahi? ( >=net-dns/avahi-0.6[dbus] ) + caps? ( sys-libs/libcap-ng ) + fuse? ( >=sys-fs/fuse-2.8.6 ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( sys-block/open-iscsi ) + lxc? ( !systemd? ( sys-power/pm-utils ) ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + openvz? ( sys-kernel/openvz-sources ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2 + ) + pcap? ( >=net-libs/libpcap-1.0.0 ) + policykit? ( >=sys-auth/polkit-0.9 ) + qemu? ( + >=app-emulation/qemu-0.13.0 + dev-libs/yajl + !systemd? ( sys-power/pm-utils ) + ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + systemd? ( sys-apps/systemd ) + virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) + wireshark-plugins? ( net-analyzer/wireshark:= ) + xen? ( app-emulation/xen-tools app-emulation/xen ) + udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) + virt-network? ( net-dns/dnsmasq[script] + >=net-firewall/iptables-1.4.10 + net-misc/radvd + net-firewall/ebtables + sys-apps/iproute2[-minimal] + firewalld? ( net-firewall/firewalld ) + ) + elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 .git-module-status + fi + + epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch + + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ + EPATCH_SOURCE="${WORKDIR}/patches" epatch + + epatch_user + + [[ -n ${AUTOTOOLIZE} ]] && eautoreconf + + # Tweak the init script + local avahi_init= + local iscsi_init= + local rbd_init= + local firewalld_init= + cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init" + use avahi && avahi_init='avahi-daemon' + use iscsi && iscsi_init='iscsid' + use rbd && rbd_init='ceph' + use firewalld && firewalld_init='need firewalld' + + sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init" + sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init" + sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init" + sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init" +} + +src_configure() { + local myconf="" + + ## enable/disable daemon, otherwise client only utils + myconf+=" $(use_with libvirtd)" + + ## enable/disable the daemon using avahi to find VMs + myconf+=" $(use_with avahi)" + + ## hypervisors on the local host + myconf+=" $(use_with xen) $(use_with xen xen-inotify)" + myconf+=" --without-xenapi" + if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then + myconf+=" --with-libxl" + else + myconf+=" --without-libxl" + fi + myconf+=" $(use_with openvz)" + myconf+=" $(use_with lxc)" + if use virtualbox && has_version app-emulation/virtualbox-ose; then + myconf+=" --with-vbox=/usr/lib/virtualbox-ose/" + else + myconf+=" $(use_with virtualbox vbox)" + fi + myconf+=" $(use_with uml)" + myconf+=" $(use_with qemu)" + myconf+=" $(use_with qemu yajl)" # Use QMP over HMP + myconf+=" $(use_with phyp)" + myconf+=" --with-esx" + myconf+=" --with-vmware" + + ## additional host drivers + myconf+=" $(use_with virt-network network)" + myconf+=" --with-storage-fs" + myconf+=" $(use_with lvm storage-lvm)" + myconf+=" $(use_with iscsi storage-iscsi)" + myconf+=" $(use_with parted storage-disk)" + mycond+=" $(use_with glusterfs)" + mycond+=" $(use_with glusterfs storage-gluster)" + myconf+=" $(use_with lvm storage-mpath)" + myconf+=" $(use_with rbd storage-rbd)" + myconf+=" $(use_with numa numactl)" + myconf+=" $(use_with numa numad)" + myconf+=" $(use_with selinux)" + myconf+=" $(use_with fuse)" + + # udev for device support details + myconf+=" $(use_with udev)" + myconf+=" --without-hal" + + # linux capability support so we don't need privileged accounts + myconf+=" $(use_with caps capng)" + + ## auth stuff + myconf+=" $(use_with policykit polkit)" + myconf+=" $(use_with sasl)" + + # network bits + myconf+=" $(use_with macvtap)" + myconf+=" $(use_with pcap libpcap)" + myconf+=" $(use_with vepa virtualport)" + myconf+=" $(use_with firewalld)" + + ## other + myconf+=" $(use_enable nls)" + + # user privilege bits fir qemu/kvm + if use caps; then + myconf+=" --with-qemu-user=qemu" + myconf+=" --with-qemu-group=qemu" + else + myconf+=" --with-qemu-user=root" + myconf+=" --with-qemu-group=root" + fi + + # audit support + myconf+=" $(use_with audit)" + + # wireshark dissector + myconf+=" $(use_with wireshark-plugins wireshark-dissector)" + + ## stuff we don't yet support + myconf+=" --without-netcf" + + # locking support + myconf+=" --without-sanlock" + + # systemd unit files + myconf+=" $(use_with systemd systemd-daemon)" + use systemd && myconf+=" --with-init-script=systemd" + + # this is a nasty trick to work around the problem in bug + # #275073. The reason why we don't solve this properly is that + # it'll require us to rebuild autotools (and we don't really want + # to do that right now). The proper solution has been sent + # upstream and should hopefully land in 0.7.7, in the mean time, + # mime the same functionality with this. + case ${CHOST} in + *cygwin* | *mingw* ) + ;; + *) + ac_cv_prog_WINDRES=no + ;; + esac + + econf \ + ${myconf} \ + --disable-static \ + --disable-werror \ + --with-remote \ + --docdir=/usr/share/doc/${PF} \ + --localstatedir=/var + + if [[ ${PV} = *9999* ]]; then + # Restore gnulib's config.sub and config.guess + # bug #377279 + (cd .gnulib && git reset --hard > /dev/null) + fi +} + +src_test() { + # Explicitly allow parallel build of tests + export VIR_TEST_DEBUG=1 + HOME="${T}" emake check || die "tests failed" +} + +src_install() { + emake install \ + DESTDIR="${D}" \ + HTML_DIR=/usr/share/doc/${PF}/html \ + DOCS_DIR=/usr/share/doc/${PF} \ + EXAMPLE_DIR=/usr/share/doc/${PF}/examples \ + SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \ + || die "emake install failed" + + 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/sysconf + rm -rf "${D}"/var/cache + rm -rf "${D}"/var/run + rm -rf "${D}"/var/log + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + use systemd && \ + systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd + + newinitd "${S}/libvirtd.init" libvirtd || die + newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die + newinitd "${FILESDIR}/virtlockd.init" virtlockd || die + + 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 + + # We really don't want to use or support old PolicyKit cause it + # screws with the new polkit integration + if has_version sys-auth/policykit; then + rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy + fi + + # Only sysctl files ending in .conf work + dodir /etc/sysctl.d + mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml + fi + + if ! use policykit; then + elog "To allow normal users to connect to libvirtd you must change the" + elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf" + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + readme.gentoo_print_elog + + if use caps && use qemu; then + elog "libvirt will now start qemu/kvm VMs with non-root privileges." + elog "Ensure any resources your VMs use are accessible by qemu:qemu" + fi + + if [[ -n "${REPLACING_VERSIONS}" ]]; then + elog "" + elog "The systemd service-file configuration under /etc/sysconfig has" + elog "been removed. Please use" + elog " /etc/systemd/system/libvirt.d/00gentoo.conf" + elog "to control the '--listen' parameter for libvirtd. The configuration" + elog "for the libvirt-guests.service is now found under" + elog " /etc/libvirt/libvirt-guests.conf" + elog "The openrc configuration has not been changed. Thus no action is" + elog "required for the openrc service manager." + elog "" + fi +} diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 4703c2587d87..31679cb95f23 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.71 2014/12/18 21:05:55 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.72 2015/01/27 10:42:52 tamiko Exp $ EAPI=5 @@ -10,6 +10,8 @@ MY_P="${P/_rc/-rc}" inherit eutils user autotools linux-info systemd readme.gentoo +BACKPORTS="" + if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="git://libvirt.org/libvirt.git" @@ -23,6 +25,9 @@ else else SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz" fi + SRC_URI+=" ${BACKPORTS:+ + http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz + http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" KEYWORDS="~amd64 ~x86" SLOT="0/${PV}" fi @@ -223,6 +228,10 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ + EPATCH_SOURCE="${WORKDIR}/patches" epatch + epatch_user [[ -n ${AUTOTOOLIZE} ]] && eautoreconf -- 2.26.2