From 3b4cfea1868612c775f87df4ca6e1b537cde77e5 Mon Sep 17 00:00:00 2001
From: jbu <pullmoll@t-online.de>
Date: Thu, 23 Apr 2015 09:54:38 +0200
Subject: [PATCH] Make /etc/sv/distccd/run use /etc/distcc/clients.allow

---
 srcpkgs/distcc/files/distccd/run | 17 ++++++++++++++++-
 srcpkgs/distcc/template          |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/distcc/files/distccd/run b/srcpkgs/distcc/files/distccd/run
index 049209a0609..ae3713fe971 100755
--- a/srcpkgs/distcc/files/distccd/run
+++ b/srcpkgs/distcc/files/distccd/run
@@ -1,2 +1,17 @@
 #!/bin/sh
-exec distccd --no-detach --daemon --user nobody --no-fork --allow 127.0.0.1
+PROG="distccd"
+USER="nobody"
+OPTIONS="--no-detach"
+OPTIONS="$OPTIONS --daemon"
+OPTIONS="$OPTIONS --user $USER"
+OPTIONS="$OPTIONS --no-fork"
+ALLOW_FILE=/etc/distcc/clients.allow
+if [ -f "$ALLOW_FILE" ]; then
+        ALLOW_OPTIONS=$(sed -e 's/#.*$//' -e '/^\s*$/d' -e 's/^/--allow /' < $ALLOW_FILE)
+fi
+if [ -z "$ALLOW_OPTIONS" ]; then
+        # Default to allow localhost
+        ALLOW_OPTIONS="--allow 127.0.0.1"
+fi
+OPTIONS="$OPTIONS $ALLOW_OPTIONS"
+exec $PROG $OPTIONS
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index d98752a4bcf..66aaa7086c8 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,7 +1,7 @@
 # Template file for 'distcc'
 pkgname=distcc
 version=3.2rc1
-revision=8
+revision=9
 build_options="systemd"
 build_style=gnu-configure
 configure_args="--disable-Werror --with-gtk"
@@ -30,7 +30,7 @@ post_install() {
 	fi
 	vsv distccd
 
-	# gcc wrappers	
+	# gcc wrappers
 	vmkdir usr/lib/distcc/bin
 	for f in gcc cc c++ cpp g++; do
 		ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f}