Stop relying in conf.d file, fix zeroconf handling (#480386 by Malte Starostik)

Package-Manager: portage-2.2.4/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 36 insertions, 27 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 3907be574d67..5d25ca63c2f0 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.225 2013/09/05 19:08:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.226 2013/09/21 12:20:46 pacho Exp $
+
+*distcc-3.1-r9 (21 Sep 2013)
+
+  21 Sep 2013; Pacho Ramos <pacho@gentoo.org> +distcc-3.1-r9.ebuild,
+  +files/distccd.service.conf, -distcc-3.1-r8.ebuild, distcc-3.2_rc1.ebuild,
+  files/distccd.service:
+  Stop relying in conf.d file, fix zeroconf handling (#480386 by Malte
+  Starostik)
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> distcc-3.1-r7.ebuild,
   distcc-3.1-r8.ebuild:
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 2627bcfb9778..a42f18544959 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -31,7 +31,8 @@ AUX distcc-gentoo-multilib-r1.patch 4245 SHA256 78839f7392769ab41509e84f07c36d07
 AUX distcc-gentoo-multilib.patch 3784 SHA256 d3af7a7592d0a11a35d294022b36feca2fb625e4799513bf56a79e0656278403 SHA512 ed267ac1be6d96fb3fc51d62a21f8a4db222198ea321f7e217d72c16c36e5c6e560b8e2e5281e66839ccab8667f59861e866f46be9c271743ded48c17bb0e27f WHIRLPOOL 3706e6c8231c6c2f5b05c3ec8e238c7f78ebeb4cac592d9f6b4d3723b370fd26e76b297ca8eeff04e5f5b8e1203d3db31d4fb42f2a49f53da43a74e69305c2e7
 AUX distcc-hardened.patch 1084 SHA256 dcf63f201cb7f4bf13eeb1485a5056c64370b9239d28e4acc77a47046dcda6cf SHA512 d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057 WHIRLPOOL 5faa97711f48d3bb41c6362d9467dab28546d01015de1b76eaaf847d633711bf56af16d1e3484b9bf9215cdf5436fcc6837bc870287cce02553b9ff756215111
 AUX distcc-march-native.patch 934 SHA256 bc95daad65a3c3a7429b94b432b5d2aa470cb50d6e67c65303865df1e28831e7 SHA512 5508202c6fbb690f68780d9189947f0c65bb30a54f5b488b079ce3d9b5d3ad663a4cb12655ceda58c81ae6c40782ff1c2d7042fa1908a3ad925a646c2ad0b6ad WHIRLPOOL 04ceafe485977b33006d61a95ee99f022b699b11b7402eb73fae322c2933a939cd8598593b8ed6253b0f94723a500f31b8673c083166e41036d76c06134a5097
-AUX distccd.service 251 SHA256 b0da4c6fc3123dba5626969ee1364baa3094d39949002787247dfc3e43edc7f4 SHA512 4a72c601af25e0030de83e6ff4ce666db83d60ff33821f661feda7e246ece4c4a75b253319140dbb0669613eab42348742f967872e34747929bf92f00e5dd2a4 WHIRLPOOL 707f937da34c492edf376f82725d7969715dfff3998bcc1aebf8460e4bad733c4c0fe6db521383f8d8bf7bb2b75b6376765f7ab6cc5895d3caa94abc37c5968f
+AUX distccd.service 244 SHA256 d9cbc0f6fbadd1628dfdd9b31f5ade85f4a29cdd2dc05382aff8d9539881a746 SHA512 0626a2da412df4a124ec8f3486b48af92895e97ad626bb848f14e60c9b016de313ca7c17a09565de95fa48233c9f7e37bf79038d1115b339a2033f0eacf0a22f WHIRLPOOL 31e258449949cd8185e5f83cfdc62017dd5576e8c80468fc5624c6f49abd133b488f3d333096fbdb213a8a7dddfb2d2414949e5fc1e68c79c569fd73298f3c93
+AUX distccd.service.conf 186 SHA256 75fd7954ab324efeeb3c7a9379bf261370f4aa715c57f3a9b39413822ce5ebc7 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6 WHIRLPOOL 7b110c3a799469d368ae510d915fbdc6999a4750fa4abd91045e5576ac5aedb5daa063741a5833388d2dfb97d5b76e235bfd49875bd571f4732e27e8cabdabc7
 DIST distcc-2.18.3.tar.bz2 341601 SHA256 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
 DIST distcc-3.0.tar.bz2 582700 SHA256 bb6f5674b619ef1438da67739d982e8a6b11e01f748708e0fcbe371c02f020fe
 DIST distcc-3.1.tar.bz2 588820 SHA256 f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89 SHA512 0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd WHIRLPOOL 9152feab2b7def17606259293fe7af7815ec295defa0287b7e5c054f17b0cb73d07f6e721855fd06eec4fc838c44ff509db20fc89c47871f7f1349e08cd126bd
@@ -41,26 +42,14 @@ EBUILD distcc-3.0-r4.ebuild 4596 SHA256 3a0637a8c2425d3b9736c221f3b00d95c65c0e2f
 EBUILD distcc-3.1-r5.ebuild 4742 SHA256 f8e73d2bbd5d04298feeb02f690f9f89184d48ed894787222761efea1d5de11c SHA512 a037869a2d7adf3cc0e1952d8985e18afc21eb46eae5ef5739c105f6a4a8f50e2c96fe2dc41801685ba4a51b9500294c24366ffe692fe9716d98bf8259e203a1 WHIRLPOOL 7c622631cffafd770d62b7633b9e8f7872fbdd3abddf83f4bf0f0362937c377fcd149dc419e2fb1816063adfab3680776c30634e18cee1aadc2bed9705bb3a66
 EBUILD distcc-3.1-r6.ebuild 4810 SHA256 3bc5e2d21ef43f0678b111bb4ea210a0b1398fa4c6ed035f638ebe51a9ed49ea SHA512 f7d03d9d849e41ff6bc89bcb9bd53a57e18ec07170bdab421f36f34d25e6b9713c28a94124d5d84e1f165b75b122f5c2c44472e1764069b1efc5f4ed86570e2e WHIRLPOOL 228fb40a2c5f11e5c5fe2beaf1fcc7e3e2817af601a9ab21f277e771761179a1f19fd0352b362472378a236ef09f903fa5e80983aac8fcfcabba9352e24590c6
 EBUILD distcc-3.1-r7.ebuild 4484 SHA256 f3076bed7677b245441e7f0013e6e40c72be19dacb09234565f965cd356f5394 SHA512 4831a9d3e9674335606c17b6033b4698371daf202681e258b262ca9e5dde0bfddb27e6a02e27c2732c1f9bcd27059a477ac9ab67e2d6cd3e751c8c6959dec7f3 WHIRLPOOL 4f4dde64004bbae550b5613608d3453302247f9278d581e12bef201de2734a8ea9e4b58ca58d5a8f0f41498cdb9b06b57dd2d3a7cb46a87cf2ee00e97280703a
-EBUILD distcc-3.1-r8.ebuild 4538 SHA256 ccb811eb5cc7c06a0c6b41dc675ab898ed77eda1ca3821d2c8c9a93d904b3f3d SHA512 e57fcd89bfa80abdaed4516c7e1427e57604012e7f204540d4fbbc6e461f76d561a55ef8a25707223cf7a3c9551f26ffbed1699a559b9c892c3bbd9273573b3d WHIRLPOOL 96df8af692cf82e1a4d98a8c1ab67572e5e03bc3ef80e0171f9c42758f2952231a3a784cbb5adf7185e6a4f1ac1c0cb81c1651bed39ee8f118f51f4508efad63
-EBUILD distcc-3.2_rc1.ebuild 5809 SHA256 b03a062a9068017aa0c87da23cbe27f78fb2663736c989f8effe9d0518859541 SHA512 93a69e38233412911b9a9b69db64b1293744a5cc1187a7a8e7273de109e73bf21f8277d267e1c240742812e16ffb7f378c2d1d89c63b0ecfa535ad26960e60b6 WHIRLPOOL c639c023a3eac4e02811cafb0b62228b0636c961ce09f168b961aad53b9578f93908c10f7e1b91b1058531099a35f08ac0d82b0889263a39665c1bae760f6952
-MISC ChangeLog 40372 SHA256 dfb3061d7a051972c0db1aade331ca7631df58caf6ec99dae08a48454743a0e0 SHA512 e33e06bdb67f23e901a6bf73328156eab8b9ac053c87e7f07b32eaa0d6687dab1e77acb276b10ab9baf2642fe9b975595d91625d28237525c14f89ea44c0e1ab WHIRLPOOL 2ce3b73ff930a6470a5edaace7f88aaa3b75eb92c7147df66a723b54ff6205f323dff2627df485bafb19fc45ce042afee0be0469937f05f6550fa7ec261a39e2
+EBUILD distcc-3.1-r9.ebuild 4693 SHA256 bcf12143d4550ab6479448baf39c406e742e40f43572e926f286d09229527889 SHA512 8fc765d6bb683789f8e9e1fb02d8d912fc5d3e6626175b5ac8b8ecdcf259b2d84517b2ebc4d95858b804b8a6cb535eec052fe041ec751713f4976d67a9fc16ca WHIRLPOOL 1fccf09865817500363c49d524bb623b9e9031216ca5c55070c928e5f7cedde2533d74740438dce1c2cecf7516567e6931bb77ea6460dc36ef44439d28acde1a
+EBUILD distcc-3.2_rc1.ebuild 6017 SHA256 87896a636aeffbbe67f9697cef141656688580ea3d979630192bc5b8145227de SHA512 0fbb35a9b8d003bc1ecb0369bb98bac36bbb13183705a750930290a0228d54e2f1e85313532ee700a3e07f072782a3758506abf629d393a4c3b3e952e60daf1f WHIRLPOOL a5e6393410ce3ffe2f8961d8ebf385206625a4795b7345bdb1a62654e262a707fe04bcf02e295e77a5ec082369eba576b8ceaf768a1b2000140c130f3d66dd5d
+MISC ChangeLog 40657 SHA256 d53c4b1e4d9aa2f81d62dad6ccdf52419b6ccb8fd897ca5aab1453b9a3c42692 SHA512 e0416bc8c1cd5ce7bfd5730d0e1e14584471159d6f1f25e0106702e0e7a6aeadc2aa81a970d6764666cefc06159af243276159f737ad2e902259a0b791daa173 WHIRLPOOL c248a819c108027ade5c32a7ad3b6227e97b8fa087e2f93617d92ed2b48453b0266e3825fca9b70f589c3cdd7d43213c5c098fd1e123749fd2ec09a232674b8d
 MISC metadata.xml 490 SHA256 c507fd5ee99486759c3acb83a13d874253ce959acd93ac3084febc424a46df86 SHA512 b076932259b157a51d6006324835ab91a9cb86538fb95b8e321647e90675c210051fa3ea342ed1b26b884c166e2825aa16056f2178029cf5d7bf1042cc9425ef WHIRLPOOL 53eb51b9e8fa1acbbef117955d1ad51b36ead058b6cd0b09d902467a58de9854f0b896d7a8961ec2ef019b7d7e39ef24802a5fbb23a11618a9535c17e98bc038
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNbgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOppAP/iQCTve2A3JlbFFHR7Zmj4WS
-Wh5Jx0YGK5lwe2790gcedib+Derp3bUMng9IAzgfZOjszjvdqmu+hqvgaaFrQT95
-FvpQi2g2V/rTMS78bwszKJ8Bd7Fta+xQ6lWX7tIq+K9IVEn1JNJ69F1Wgx0Rjrc/
-HLI2NqGXHqm7UW9wqCWSJyY0epwNBvSjaSFosoezeiu15mqiqUbnvE9bWZiXbRxx
-5N0NU1kZZuCwMqAnqf4Op4KOAOQHbxlaKMAaxU8sSLcAiiiZyenAG2SGjvDO9nlr
-fAO6/n9CbUHHAs+iDmLpKFngnLMQQnEk21b8vp/3EmOJIGfCjnS9yenPGFUY7qI0
-RzJFIo+X2fbPqPBWbxO/6rcjp/sm46dgqrVjmc+vUBjmqbGUoGJtXoThVKr29w9J
-/kwec1HKZAgKPCFElF2vEU3D6vwDC3ClxyJG9cIWEaIiIBDxVOsNKRatvncRWYNZ
-UczZWonqSMnEldsXUbY50BIxyRb/Ux1F7iBix7zm9u//ETtRx9OvCMoSJtF43L+s
-2wS54ty3wHZCPcs9Brw0meizuTyjUfs/A2hLPq3DplZC5BhaowzWou6LyvU08ueB
-uvO0D8Duo/xXm+9mQNvziN5SW3YNhiW0dhw1k1T+Y77MVpOdk/wqzZ2OxniUBqTP
-RhnVrUAmeofV2I2t/mHp
-=ZnRT
+iEYEAREIAAYFAlI9jyAACgkQCaWpQKGI+9QZ3wCfdbFXiHmAH5grCVCGyvJYlvJM
+G0wAn2pjgMeRS5XqgGi5wsIH5qqeAIUT
+=IdKA
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/distcc-3.1-r8.ebuild b/sys-devel/distcc/distcc-3.1-r9.ebuild
index 447ee5b90a5d..f48d983a29a4 100644
--- a/sys-devel/distcc/distcc-3.1-r8.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r8.ebuild,v 1.2 2013/09/05 19:08:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r9.ebuild,v 1.1 2013/09/21 12:20:46 pacho Exp $
 
 EAPI=5
 
@@ -80,6 +80,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PV}/init" distccd
 	systemd_dounit "${FILESDIR}/distccd.service"
+	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
 
 	cp "${FILESDIR}/3.1/conf" "${T}/distccd"
 	if use avahi; then
@@ -88,6 +89,8 @@ src_install() {
 		# Enable zeroconf support in distccd
 		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
 		EOF
+
+		sed -i '/ExecStart/ s|$| --zeroconf|' "${ED}"/usr/lib/systemd/system/distccd.service || die
 	fi
 	doconfd "${T}/distccd"
 
diff --git a/sys-devel/distcc/distcc-3.2_rc1.ebuild b/sys-devel/distcc/distcc-3.2_rc1.ebuild
index af9765ef57ad..7cacb924e174 100644
--- a/sys-devel/distcc/distcc-3.2_rc1.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild,v 1.5 2013/02/12 09:09:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild,v 1.6 2013/09/21 12:20:46 pacho Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
 
-inherit autotools eutils fdo-mime flag-o-matic multilib python toolchain-funcs user
+inherit autotools eutils fdo-mime flag-o-matic multilib python systemd toolchain-funcs user
 
 MY_P="${P/_}"
 DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
@@ -99,6 +99,8 @@ src_install() {
 	dobin "${FILESDIR}/3.0/distcc-config" || die
 
 	newinitd "${FILESDIR}/3.1/init" distccd || die
+	systemd_dounit "${FILESDIR}/distccd.service"
+	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
 
 	cp "${FILESDIR}/3.0/conf" "${T}/distccd" || die
 	if use avahi; then
@@ -107,6 +109,8 @@ src_install() {
 		# Enable zeroconf support in distccd
 		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
 		EOF
+
+		sed -i '/ExecStart/ s|$| --zeroconf|' "${ED}"/usr/lib/systemd/system/distccd.service || die
 	fi
 	doconfd "${T}/distccd" || die
 
diff --git a/sys-devel/distcc/files/distccd.service b/sys-devel/distcc/files/distccd.service
index 346f5d67eb73..3eb61396b84c 100644
--- a/sys-devel/distcc/files/distccd.service
+++ b/sys-devel/distcc/files/distccd.service
@@ -1,11 +1,10 @@
 [Unit]
-Description=Distccd A Distributed Compilation Server
+Description=Distccd: A Distributed Compilation Server
 After=network.target
 
 [Service]
 User=distcc
-EnvironmentFile=-/etc/conf.d/distccd
-ExecStart=/usr/bin/distccd --verbose --no-detach --daemon $DISTCCD_OPTS
+ExecStart=/usr/bin/distccd --verbose --no-detach --daemon --port 3632 -N 15 --allow $ALLOWED_SERVERS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sys-devel/distcc/files/distccd.service.conf b/sys-devel/distcc/files/distccd.service.conf
new file mode 100644
index 000000000000..a334c3724b96
--- /dev/null
+++ b/sys-devel/distcc/files/distccd.service.conf
@@ -0,0 +1,6 @@
+# --allow is now mandatory as of distcc-2.18.
+# example:  --allow 192.168.0.0/24
+# example:  --allow 192.168.0.5 --allow 192.168.0.150
+
+[Service]
+Environment="ALLOWED_SERVERS=127.0.0.1"