diff options
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/distcc/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-devel/distcc/distcc-3.1-r9.ebuild (renamed from sys-devel/distcc/distcc-3.1-r8.ebuild) | 5 | ||||
| -rw-r--r-- | sys-devel/distcc/distcc-3.2_rc1.ebuild | 8 | ||||
| -rw-r--r-- | sys-devel/distcc/files/distccd.service | 5 | ||||
| -rw-r--r-- | sys-devel/distcc/files/distccd.service.conf | 6 |
5 files changed, 27 insertions, 7 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/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" |