Version bump (bug #512566, add minimal keepdirs, drop pm-utils dependency when using systemd), drop vulnerable unstable version (LSN-2014-0003).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1A5D023975B0583D!

4 files changed, 55 insertions, 30 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 1526a417bd27..72c141cdf852 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.363 2014/05/17 14:37:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.364 2014/06/16 15:28:59 dev-zero Exp $
+
+*libvirt-1.2.5 (16 Jun 2014)
+
+  16 Jun 2014; Tiziano Müller <dev-zero@gentoo.org> +libvirt-1.2.5.ebuild,
+  -libvirt-1.2.4.ebuild, libvirt-9999.ebuild:
+  Version bump (bug #512566, add minimal keepdirs, drop pm-utils dependency when
+  using systemd), drop vulnerable unstable version (LSN-2014-0003).
 
   17 May 2014; Doug Goldstein <cardoe@gentoo.org> -files/libvirtd.init-r12,
   -libvirt-1.1.3.3.ebuild, -libvirt-1.2.1.ebuild:
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index a715120ea245..5eb21f1f8185 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -6,29 +6,29 @@ AUX libvirtd.init-r13 3678 SHA256 5744e7392b0777d14142552237f517ff1fbf6c4734aff9
 AUX virtlockd.init 437 SHA256 0894a839f85dff6f97bde514437935f4c1589ba4f2cbd3e0efe28753698694a1 SHA512 3d7b366736fb98acd26577e29a3c00592e7be038634fc3b51891f557426cd9945bf08a4486f1d62aa91ce7dc7d6bf96d7e57ef06a3a0b4aceb55b9e9c9e9b2da WHIRLPOOL d633a1a7358dbf7bd94d70f44753c9c346adfc78537643e5f379cea017d20e1097998ecfaf87e47e4e0f9216d43a3053af24e3129ecfb8f110f5283a769f368f
 DIST libvirt-1.1.3.4.tar.gz 26646511 SHA256 d2d62f55e925f38923339c79fb58dd0e2509b79f63e9463addc778b64112bf94 SHA512 8c27757238002e2dced7920d35cdbff4b908d61b26e92e39b77520349ee5492044827106a71c276dc86c03a1a34e75dc8abd200f56a675eae52a114a6c67ddf2 WHIRLPOOL ee4229fa79fb1419663bd61a296011c63765319725ef006d902523e3c67ce7f77417978d8f3d57a7c61b8827998771f163666317ec5e142f201dab16ecd3bf18
 DIST libvirt-1.2.3.tar.gz 28605530 SHA256 b489d1a29c6166643d34b72795a89b03c6ac775cdaeadb6aa86fc1a982c02e31 SHA512 5ff85a98a0c62229d0ab8125d20fce982f8497d20cb89758bc37f475d7a5d59caa6d962e6c2313e1c494ca1648a836fcad253ceaccc34cc0060135470be3db5b WHIRLPOOL a431ff4584abed3454f30811b3673c0268f5d172d26d768c3157f1eddb8e242c084e7d81b9ea4c6fabd8f42a424cffae81b4695f475a8e6173a7710605a79f02
-DIST libvirt-1.2.4.tar.gz 28690741 SHA256 e43ac5f6b2baeafcd01777be03a897e636f8d48c0cdfb4c4cbb80d45faa9e875 SHA512 49be7fe73cbcdf51e6978740fd3603f21f813c388da89a139a09195d68d3ff445d2c939a1ea212c7498e8c2ace9685a8fb52dfd8ccb88a26ecf9b4228d502616 WHIRLPOOL 10793dcc4f535d54ccafa384023b25e608ee011aae73258cce6e713a451292f9af483470a95a351717000dce391b292e1dd1999988a2c1c3a71c3a76edd22bff
+DIST libvirt-1.2.5.tar.gz 28829671 SHA256 8ee97de3435b823ad2bc40a0b3c395efe2184ae748a92e2211fbe9393939ed45 SHA512 5ac109ebe9ddbb6fe122843d04ca3d703984fa67d3c62b294edc03da07ba527970eae4f12dc885f9ea78f4c711cdce512fa4ca4d3677f5f17892cc3b48e1562c WHIRLPOOL 806e9d16df9aa212a04fda4955a9473bd5338f5434312c3265776a4b54ba02e8971e006b2233a4431cd4146488c15b84d7ad7103c5be5ca35e8a9dbb70596acb
 EBUILD libvirt-1.1.3.4.ebuild 12247 SHA256 5e21dcf8f227d56f3a50580ab199d1bb7c1727d6f73bc72ab891151c3fdf27fe SHA512 1f2d3606fa279d22264e4c37102f79539e5fe48568749501504df6d66009578001df436d5d23df37cf5df28fcbbbd9e97b9531ba547adc5e1f98a23d1173c273 WHIRLPOOL 64035eeacb9d8e9bdfae0f5baa9332bc4e970225156162c7852dec22a615ca2605ea8f77ffec4491b98b3be47fdd9549139d32d8064a421a43d84c605fc45038
 EBUILD libvirt-1.2.3.ebuild 12294 SHA256 53a8e43eef42b330915e52678ff0a7d5d641b0cb5c169fb7699684ec704171e6 SHA512 de019f8b0e3fcac4ad82803341adef185c040f88377a447f9003fd133c9e04f8d21f928a8fa7435fcdc14d7c78d169941f04151f8f4c84e7a0cfd4711b1a5e99 WHIRLPOOL 7482bacc5772ddfa435815d1e190477b0d4c506e7b30445684a0dc6bb1b2e2eee49838082f6c6594e8213f484fb929292399f5318cb6973a96d702d74db8e741
-EBUILD libvirt-1.2.4.ebuild 12296 SHA256 fa9f4efb6a3c07a0c3f978c5e1fa19e98a554e1fb95715f2e49fb02b60108e14 SHA512 d8b9eeb56e9e3534a406b9b2d05b3cd7998c3a9c5506a1d40e1426d79ab12a653a8408353d1fb8f7be7a3b206abc0a55e8d3d105eb199a49e8e252ffe27d985c WHIRLPOOL a1a18b9a66e64b85893d00d95faa63d608fd57fb7adfb1a1fc37ce3d07b347fef964653e9654bff142b4e9f66caf9f733bfaf3b4b4ab9144bc0f92ec7c44b8df
-EBUILD libvirt-9999.ebuild 12070 SHA256 346c529884f82164f893c846015d4c2bf7882b7526702985de53584cac6cc86b SHA512 0313120b4d6e62b8c728b4665d6f3c393555c731b84b1af3e1b6bfe531e247c0f44dc24752022332622d48c4ca6b663c74624edee1f5f03fcd76a69f45dda3d0 WHIRLPOOL 4de29606d968c00b8d71b896099d8b02a280eeb7e986f510593eaeefecca448cfc9b3b0ad09e6fe68c8550a4859263c01d101b2acf6916ef00ed7f5c2d5eddec
-MISC ChangeLog 17862 SHA256 5ee6cfe2603455025c058678211e409bd6f4991e87a58a4e7916743dcac0a89c SHA512 9c68c934d986f9ae19736756de5c948fd2231b1d7edb421b3ceff57d1052c20f764752cf3fbec1b4300e7fdf3781f5f04dcd30a88f8d37c659a1342dad099e3d WHIRLPOOL ce03e5dd204515b4eb97f40f21a9f9f47c643bc585964d470598e783031c409242ba52c47b923d15153b89fcb1b54bb414a57baaf65a45c296cce881458cd720
+EBUILD libvirt-1.2.5.ebuild 12481 SHA256 29ac952588c5e2b770c8eb3304e7ead1c7ab6736f6aa3da5f3940f7edeab5716 SHA512 98265c3120ce4526c1703d14eed1f33c1dfc5c9670dccbaa586ec40ced4ab48f470d7522404054283b89c26c4632392f6f67f70d0da276da0419ab062a4b59f6 WHIRLPOOL 66933c1c05513384b828ec19f7e585c86b34d882dc5fa81c16bb14a2b7483a5674ca49b349c54467088b23ae3cb914d80607237c87c739846d00447f529f322a
+EBUILD libvirt-9999.ebuild 12477 SHA256 5ad160e874211192694b77c4bdd0d784dc4a717215fb275c57a42baa8e02573d SHA512 097c7d50a6fe6c85759bcc04fbc2fe1486b2cf88bad4b5111bc55362914a3f0665efd35d5913920e8ae28d1294ccc63a14a555d6516937b3301f8d4d87edfd3d WHIRLPOOL fa062453677afc7affbc0c6ba9f3218900ec9479b9427b017a055675d45f1376453be0eeeee1b6c87810d0be5332fc47ad2ad95c536c9cbd4ba768e9bde4bbd1
+MISC ChangeLog 18166 SHA256 52196d8b1737d3c2e29b91f99b42a4e97c20dc1ced7a5b95f39347c72f718405 SHA512 5c0a1f60152b71d276a45abbd4ba179fac9b7913c4bf7b1606e2363d4bc4b1db7ac2c6e25ae6a5b1ce13dc3c0732736543265b62b4c7bc5f3459cd3d0fd44814 WHIRLPOOL f6cbddf99d14daf7af81a237a5f3b18970658ac415be46fbdfb40487cfcaea41e5eac333e16bfeba228034bac9909b09db2279737ff4676a4c5ad71409513889
 MISC metadata.xml 3447 SHA256 39904bed8984cae6dcd825a88a5c28e2692d47fd13da73f5041b58e254e3b350 SHA512 d0972e6eeb32de75ca14c183873e59f87948f621d873cfeac3e930b63775fd2b8b776fdc482b9dc8c4bc2ee24ee45a52e35cdbf8adec30881ddbd745f249a312 WHIRLPOOL 2591d99b26d2ce784112a862b8362ef2a738a557bb2f712558216cf25b6680ec77dca9f5ec5696f4a949139a6de4e7e9ce8c0bad1690282ca169c28d218e5b6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTd3QeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBRUIwNzAzODgxM0ZDOEYwRjMyNzIzQTIx
-Q0UzOTYzNzdDRkU3RTJCAAoJEBzjljd8/n4rrwUP/3V1lissAxmOVppjZz6NgUnd
-Y7m3YgRHGpybujiyShFPK4F87fnb5kt2XHwz9xefuUZiD+cI8Kie0wg/7Q1rh1sK
-WEDuAaKv1mnbM2B9w70zrAkYLpceo/01kvRbTfIUtU9NCPfEr+L3B8il6y9wU6ar
-H9506MQRnb8jS51CBOpRz2dDV0EDlQqL+Gb/jTBpqLmJ88KmdZ0CpqS2nCZ8dRB5
-DuvYep39vbiu9GJx/h2cl06BkdBSILbj/MEi+ORaPRDB+ercjEqKek9yW36WzAhC
-qWI1fgbIBbDHNoyDiD5uV2bvGnCit9amarWR3TCU4BN7TJSDAQgZ4bSiW9yAHeXJ
-vXtdQWjfsecbyRlSTVG5aYuF/+ZHwzJeFnONFp/sqLpjRDGe1sPJOQcZoSiVAXIc
-WuMNBgI5it61AgBwP2cBnvvNtnWdxS6w4nyrlQaUgix/hrPURO+C0Ep4rtbAjDxR
-ojTFCi351pYc7A9OxC7p4eS2Kka9ZltkPGR/TwqNrbeXYSUEy8183w8LB3GW1I/B
-p4EAVqE2TqLBA46FRd8rKqMqLxPy/wCR4gHXMe4J4sLLE/RPp7jRp1hkysEpnf79
-Ca0g6O1ZI6nb8PKV1KLbI9MdTaiVV+nuDEFB1rxF3FEVYZfOU3wvjLK4y/LBF/lV
-iUVvzYV6u2Y7gjorjKZR
-=NgCl
+iQJ8BAEBCABmBQJTnw08XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMjM3NDkyMkQ0OTFBMUIyMzgzNkZBMkUx
+QTVEMDIzOTc1QjA1ODNEAAoJEBpdAjl1sFg9UMsP/3cuCB19dsVu0z2UqkFH3qEs
+HXQh3l2JViB70y+SR6cDty8yG4nij2YdXFLfBVEP3PaS17t9/DbM0WcLCnyYX3FN
+KGUeQSvOJaKq5vCI/llLIrYC5kdaZvVgUTx9nIgqETM91SaGzMLncVY6X+GGRe8U
+A6IqxNVWptYHDZNIbNu5gS64CxCjU/lIQEY4UpRuK+2kGLAuklnq4+oGdFcguIE6
+BIBxlbnTyIahy3om1aYTcBAC1rtKf0554yZXD44Cm54WN8XpYc86Atnrw52cQllh
+1QoerJFf3hAfF52Ds/Dh0Jd9rHpDA5WHs0LDukiCaP5cJ6fGqKDGDWGBJ644o1SH
+QVeRTqhSbdiMm1qInM5CODdXe385xALo8u9XqS2yxjCTym0PaQucPAjTdNN73WQm
+KYspk7cI7TLdNDbHDuysgASXJQRxRWhkYdiiRHtfBkNCWIVHjV9uSbYlqGS2d0Rb
+vczdoJsgLTR1jGsfYdcHw1UHMShlxpvqJTMgqNTdKsrO++zh1CEZHrIOQOSt0bN4
+x8+nu4nn2m813iQiRFuzoulpSFufnRfU99vaU6b1Qk2FkPn7tYHX/xUeLppa9AU4
+EAoUbIiFhnamGv3Vq9+NgyEAm0Q972YoKsQFcWxBCEf9YQfRSSUT9NTPwrWncj7i
+bTlSd7CgMYQwmfr5cVVR
+=2Eoa
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-1.2.4.ebuild b/app-emulation/libvirt/libvirt-1.2.5.ebuild
index c87c6e547101..d90e098fd51e 100644
--- a/app-emulation/libvirt/libvirt-1.2.4.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.4.ebuild,v 1.1 2014/05/15 02:27:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.5.ebuild,v 1.1 2014/06/16 15:28:59 dev-zero Exp $
 
 EAPI=5
 
@@ -68,7 +68,7 @@ RDEPEND="sys-libs/readline
 	caps? ( sys-libs/libcap-ng )
 	fuse? ( >=sys-fs/fuse-2.8.6 )
 	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
+	lxc? ( !systemd? ( sys-power/pm-utils ) )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
 	nfs? ( net-fs/nfs-utils )
 	numa? (
@@ -85,11 +85,12 @@ RDEPEND="sys-libs/readline
 	qemu? (
 		>=app-emulation/qemu-0.13.0
 		dev-libs/yajl
-		sys-power/pm-utils
+		!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 ) )
 	xen? ( app-emulation/xen-tools app-emulation/xen )
 	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
@@ -127,7 +128,7 @@ LXC_CONFIG_CHECK="
 	~CGROUP_PERF
 	~BLK_CGROUP
 	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
+	~CGROUP_NET_PRIO
 	~CPUSETS
 	~RESOURCE_COUNTERS
 	~NAMESPACES
@@ -380,7 +381,9 @@ src_install() {
 	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
 	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
 
-	keepdir /var/lib/libvirt/images
+	keepdir /var/lib/libvirt/{boot,images,network}
+	use qemu && keepdir /var/{cache,lib,log}/libvirt/qemu
+	use lxc && keepdir /var/{cache,lib,log}/libvirt/lxc
 
 	readme.gentoo_create_doc
 }
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 7518c2dc50e9..522d9ce368ce 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.55 2014/03/01 22:08:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.56 2014/06/16 15:28:59 dev-zero Exp $
 
 EAPI=5
 
@@ -68,7 +68,7 @@ RDEPEND="sys-libs/readline
 	caps? ( sys-libs/libcap-ng )
 	fuse? ( >=sys-fs/fuse-2.8.6 )
 	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
+	lxc? ( !systemd? ( sys-power/pm-utils ) )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
 	nfs? ( net-fs/nfs-utils )
 	numa? (
@@ -85,11 +85,12 @@ RDEPEND="sys-libs/readline
 	qemu? (
 		>=app-emulation/qemu-0.13.0
 		dev-libs/yajl
-		sys-power/pm-utils
+		!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 ) )
 	xen? ( app-emulation/xen-tools app-emulation/xen )
 	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
@@ -127,7 +128,7 @@ LXC_CONFIG_CHECK="
 	~CGROUP_PERF
 	~BLK_CGROUP
 	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
+	~CGROUP_NET_PRIO
 	~CPUSETS
 	~RESOURCE_COUNTERS
 	~NAMESPACES
@@ -157,6 +158,16 @@ VIRTNET_CONFIG_CHECK="
 	~NETFILTER_XT_MARK
 "
 
+BWLMT_CONFIG_CHECK="
+	~BRIDGE_EBT_T_NAT
+	~NET_SCH_HTB
+	~NET_SCH_SFQ
+	~NET_SCH_INGRESS
+	~NET_CLS_FW
+	~NET_CLS_U32
+	~NET_ACT_POLICE
+"
+
 MACVTAP_CONFIG_CHECK=" ~MACVTAP"
 
 LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
@@ -185,6 +196,8 @@ pkg_setup() {
 	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
 	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
 	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
 	if [[ -n ${CONFIG_CHECK} ]]; then
 		linux-info_pkg_setup
 	fi
@@ -368,7 +381,9 @@ src_install() {
 	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
 	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
 
-	keepdir /var/lib/libvirt/images
+	keepdir /var/lib/libvirt/{boot,images,network}
+	use qemu && keepdir /var/{cache,lib,log}/libvirt/qemu
+	use lxc && keepdir /var/{cache,lib,log}/libvirt/lxc
 
 	readme.gentoo_create_doc
 }