moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Merge pull request #1378 from pullmoll/master

Browse source 
Make /etc/sv/distccd/run use /etc/distcc/clients.allow
This commit is contained in:
Juan RP 2015-04-23 10:02:06 +02:00
commit 502622c141
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
srcpkgs/distcc/files/distccd/run
View file

@ -1,2 +1,17 @@
#!/bin/sh #!/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

4
srcpkgs/distcc/template
View file

@ -1,7 +1,7 @@
# Template file for 'distcc' # Template file for 'distcc'
pkgname=distcc pkgname=distcc
version=3.2rc1 version=3.2rc1
revision=8 revision=9
build_options="systemd" build_options="systemd"
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-Werror --with-gtk" configure_args="--disable-Werror --with-gtk"
@ -30,7 +30,7 @@ post_install() {
fi fi
vsv distccd vsv distccd
# gcc wrappers # gcc wrappers
vmkdir usr/lib/distcc/bin vmkdir usr/lib/distcc/bin
for f in gcc cc c++ cpp g++; do for f in gcc cc c++ cpp g++; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f} ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f}