From f92924db9c88239b744ead6df4035f683a702a53 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 13 Oct 2014 12:47:07 +0200 Subject: [PATCH] avahi: added runit service. --- srcpkgs/avahi/files/avahi-daemon/run | 3 +++ srcpkgs/avahi/template | 10 +++------- 2 files changed, 6 insertions(+), 7 deletions(-) create mode 100755 srcpkgs/avahi/files/avahi-daemon/run diff --git a/srcpkgs/avahi/files/avahi-daemon/run b/srcpkgs/avahi/files/avahi-daemon/run new file mode 100755 index 00000000000..6b78be21887 --- /dev/null +++ b/srcpkgs/avahi/files/avahi-daemon/run @@ -0,0 +1,3 @@ +#!/bin/sh +sv check dbus >/dev/null || exit 1 +exec avahi-daemon -s diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index a91d3256f4d..ef408fb146a 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -1,7 +1,7 @@ # Template file for 'avahi' pkgname=avahi version=0.6.31 -revision=17 +revision=18 build_style=gnu-configure configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl @@ -28,6 +28,7 @@ conf_files=" /etc/avahi/hosts /etc/avahi/avahi-dnsconfd.action" system_accounts="avahi:23" +replaces="runit-void<20141013_2" build_options="systemd" if [ "$build_option_systemd" ]; then @@ -46,10 +47,10 @@ post_extract() { # Switch to /run to not depend on /var/run being a symlink. sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure } - post_install() { # Enable 'disallow_other_stacks' option by default. sed -e 's,\#\(disallow-other-stacks\).*,\1=yes,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf + vsv avahi-daemon } avahi-autoipd_package() { @@ -61,7 +62,6 @@ avahi-autoipd_package() { vmove etc/avahi/avahi-autoipd.action } } - avahi-compat-libs-devel_package() { depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}" short_desc="Avahi compat libraries - development files" @@ -72,7 +72,6 @@ avahi-compat-libs-devel_package() { vmove usr/lib/libdns_sd.so } } - avahi-compat-libs_package() { short_desc="Avahi compatiblity shared libraries" pkg_install() { @@ -80,7 +79,6 @@ avahi-compat-libs_package() { vmove "usr/lib/libdns_sd.so.*" } } - avahi-libs-devel_package() { depends="dbus-devel avahi-libs-${version}_${revision}" short_desc="Avahi core libraries - development files" @@ -95,7 +93,6 @@ avahi-libs-devel_package() { vmove usr/lib/libavahi-common.so } } - avahi-libs_package() { short_desc="Avahi shared libraries" pkg_install() { @@ -104,7 +101,6 @@ avahi-libs_package() { vmove "usr/lib/libavahi-common.so.*" } } - avahi-utils_package() { short_desc="Avahi browsing, publishing and discovery utilities" pkg_install() {