Explicitly disable firewalld support, which was getting enabled just from having DBus support, which could come from Avahi support. bug #439764

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 17 insertions, 6 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index d226683bc43d..1c64ebb81a08 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.226 2012/10/30 04:43:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.227 2012/10/30 05:12:33 cardoe Exp $
+
+  30 Oct 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.10.2-r3.ebuild,
+  libvirt-0.10.2.1.ebuild:
+  Explicitly disable firewalld support, which was getting enabled just from
+  having DBus support, which could come from Avahi support. bug #439764
 
 *libvirt-0.10.2.1 (30 Oct 2012)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 8ee5b7c3a2b1..168383abd83e 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -8,9 +8,9 @@ DIST libvirt-0.10.2.1.tar.gz 21300749 SHA256 449628d798b82cb2f24416ef2e38c2d06f1
 DIST libvirt-0.10.2.tar.gz 21916817 SHA256 1fe69ae1268a097cc0cf83563883b51780d528c6493efe3e7d94c4160cc46977 SHA512 b0e784ebedf1c6694792ae9d7672101669441e08ad0352be3d57eaae03d6cd99527c2826ea41e3edcf069eab6f2168200b198bca9504d8d63375d20ecbead120 WHIRLPOOL 4a1651be688aabc3b175da762cc88dfe8b61268bf42bb731d7e74ab8b51cf2c1793c77eff6b5d7696b2a4d5bb1103f40d5fbe544d8784dc80e6899c28e2d3f50
 DIST libvirt-0.9.13-bp-1.tar.xz 6160 SHA256 dfb91f17d999f1aaf17e9cb59b64227631851ccfabaa24f0ba217dd5f4ae8f51 SHA512 9d7b7d9106fa217d1d6a218196b4692c6f560ffa2824de2b0e04ca35e8eb9ee6abeb02fece3720aa649128596c0990613d7914ab7dadfc7c8e830208882a2e1b WHIRLPOOL 54d96823526d569f081805569fa94947a0843c45cbefa83492e0da19741474fe6d07e212c5dadf93fa2d9123e05c21ab30cec9d8fff3f1ccff6dba8b41f23c8d
 DIST libvirt-0.9.13.tar.gz 20276757 SHA256 d124e9915c88c195da9c008a6d855e53e555dca5816052e163dda61388359d5b SHA512 d275cf6dd6c5700eeee701ff4d28a1483137f8c7525496069438b9e81727761066f1d4b1504bf170f6a3f457ecc203f6b5e7b367fe931803cb7592cccceb7f71 WHIRLPOOL 26a5c660c07516c3736f7bd818b6b4b06c98d78181ba991139818f321ace43a33dcc7d095ce6f02b94f7b3aea7c556bb5388cea34ef801576e4d86f9c08712f7
-EBUILD libvirt-0.10.2-r3.ebuild 10955 SHA256 9d539ab966334f71c569ce98ccf2b0d5e1e9b789866b517761de246d455306c3 SHA512 90f3a6f7df603fb196ea847624800ab9afa3fba966884277f0a801132cdb71243b3ecc470a941df0e95e081f38b8d26efaa980957d4337b0321c3d2ba45d9802 WHIRLPOOL ce7fb89ecb31d5062bdf17f890a919993044dcb076da045c7786e5bcd7315a2a04218267608a676666c95ac6e65b1c895aef3f1cb37195c1107fe43b4eead83a
-EBUILD libvirt-0.10.2.1.ebuild 11415 SHA256 32baabdce007f6d3b8b15aa2107df9429826b6cc907e8643a5720b4c562335e1 SHA512 5e2634f0a166b448cdb8dfa52e8c85d8860354aa964503250ab97fc705bb8a2279b68513e77b570cb2bef30b3007c2d7e429dd109f879d8b54ae75e2b0726335 WHIRLPOOL f8043b3fd3bd587eddff844e3a1ce9357c11c98dfb8de8a2ac385bc787040e87ed10ecb1f80bf78017d26d9a76485709553d3731ac45541341ea4290d7f078fa
+EBUILD libvirt-0.10.2-r3.ebuild 11044 SHA256 b355de68a9d205fae91e14b6daba5227cd844589228cbecea47226ea8f782250 SHA512 79e05098333cdbfb1b0f34b23087d1ccca70e7b8c3f802c4d1ec77be94df9186e747271b4ce9c9ffd95d65d3d103be3a800355de47b7244039fbeb3a0fad1d4f WHIRLPOOL 63edd30d248d20bbcd66ffac0cedf93c8ec27899ab15d78413afc50e227ca207500f8349f1c88588650704856fae363d455719486c0565933c9e3e4948ad8f6b
+EBUILD libvirt-0.10.2.1.ebuild 11504 SHA256 decd232e2400bd287ad7cae893be48e90e6b678c6c48c69c122c6696636cc2cf SHA512 670ad0ea4cd05403a35935c7d071072654cd1d9ceb0361c0fe589041ee885cc84a5d159a120f032246f1ad75ab2f4e7eecb8e50dc210708177679594b550b694 WHIRLPOOL da686d157c0e62c629c3db7247b8d1af2a6ac06cd08b196d51d10323e2b184538d1dc4438aa81e63cb10c4da2f8710c11a44a76e4741d4485f77da4faca96f30
 EBUILD libvirt-0.9.13-r1.ebuild 10769 SHA256 c04a4fbd49ca663eb2762247629a3a84aa46cdfe0b49e9098522b8353572d334 SHA512 a818f43e63cb6aa409e9a8ecad6d1ad718151e758533bc2cd5292abbf5ac943dc980fbbee3b241401e2dc2fcf6379f79109bb156afd1f30f4df96ff6543e4c82 WHIRLPOOL 5e2c29bc51a9b5e48ce81eb5f2a3fa47e3d57ea3361ab7260dc5225b545647ab1b65c759fce3edb0a814de6df8f285500c6f0d8a1ceb33e0a0b262618803f763
 EBUILD libvirt-9999.ebuild 10353 SHA256 ff2ddc2632f5b5238e877091ce98cd9ee265fee1bf34c8be73174eb651269fd4 SHA512 ab43bd2b15bf6773cd790dd65a736163031073fb924ed07eff8da818499af53b83996af4eb731c713380bcf6f1126191893fe47730e149808d98d2e6206c4657 WHIRLPOOL b0f320dec564d2d0d490bbc05f860864f894716cc2f3f49eb8dd86696fadb77f613322e17983a4968b3a9950af16652a6f68be75a0a08f55494a3fcb5a32a07d
-MISC ChangeLog 44300 SHA256 8fb7152640a7e576dc203277b0aebe184cd772dd41659a7a8e0d7d31b925d713 SHA512 bea7e88ea2cca771a8f879ffc765760597cdf7a4562633a5dc9a6dda58ae0b8514e414b9282cceb39ac4691653d3a6cd3cf5841c18c8a672f2854838ce8bd859 WHIRLPOOL 6a9822476bd83cc59cba417cb1e4fd79184964da1d1e51b35a64f66b905865ca731577070bb84ebb08bf118f875dc59755083d67e39d1d6c5fdafc3b378a1c1f
+MISC ChangeLog 44552 SHA256 d37f2e568870c0d794ac01aeac1ee4dcce994c82a9f2144ee4d54a6f3c7732b8 SHA512 abbf2d2b41d49a9ec52590a6f52ad1d43ee80ead33081ed1f75fe39603f066b21553b77cf2e8f75c806324e8797363d5da7eecf08fd8fdbb94001e978c3f09a4 WHIRLPOOL 45acf906009703ff2cea36ac6b823b1afa68d18650ad3c92aaedd688bc86cf4fee5917fb51818c6842526a081d1653ff5472dd95319dcd4e6ce3ad128962fe12
 MISC metadata.xml 3307 SHA256 677bb13ab5f99946bd4dce20bfe9c26739fd312fda5671f7080839ffc048f957 SHA512 b9dd812a97f3d698089fdd8314bab93586e9d954653f3fe90672e636c51de097bb7d211f25bbd706d71029b8f68d31cfe053b3ee2ddf035fb55ad2b3a5029089 WHIRLPOOL 707d7c1bff3c8f69fa3f3ad1dbc14c01ae313bbc16d1a27be8de314f351c1bcf8ab192eb131bb833e274dcce50f2f862f13ff784f151ab6dd8c38ea07363a0e2
diff --git a/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild b/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild
index d6e0689628ce..d18e07b3dcf2 100644
--- a/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild,v 1.2 2012/10/29 07:16:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild,v 1.3 2012/10/30 05:12:33 cardoe Exp $
 
 EAPI=4
 
@@ -273,6 +273,9 @@ src_configure() {
 	# locking support
 	myconf="${myconf} --without-sanlock"
 
+	# DBus access to iptables/ebtables and friends
+	myconf="${myconf} --without-firewalld"
+
 	# 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
diff --git a/app-emulation/libvirt/libvirt-0.10.2.1.ebuild b/app-emulation/libvirt/libvirt-0.10.2.1.ebuild
index 01003974bf26..9a11e7bfa572 100644
--- a/app-emulation/libvirt/libvirt-0.10.2.1.ebuild
+++ b/app-emulation/libvirt/libvirt-0.10.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2.1.ebuild,v 1.1 2012/10/30 04:43:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2.1.ebuild,v 1.2 2012/10/30 05:12:33 cardoe Exp $
 
 EAPI=4
 
@@ -286,6 +286,9 @@ src_configure() {
 	# locking support
 	myconf="${myconf} --without-sanlock"
 
+	# DBus access to iptables/ebtables and friends
+	myconf="${myconf} --without-firewalld"
+
 	# 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