avahi: Fix certain problems.

I've fixed certain problems reported on the bugtracker:
* avahi user and group were missing.
* Runtime dependency "dbus" added.
* Fixed wrong localstatedir.
* Program was not killed correctly by initscript.

Fixes #10338.
This commit is contained in:
Stefan Schantl
2014-01-18 23:16:43 +01:00
parent 240acdfd87
commit 192d43080e
3 changed files with 24 additions and 7 deletions

View File

@@ -18,7 +18,7 @@ case "$1" in
stop)
boot_mesg "Stopping avahi..."
killproc /usr/sbin/avahi-daemon -k
/usr/sbin/avahi-daemon -k
;;
reload)

View File

@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = avahi
PAK_VER = 3
PAK_VER = 4
DEPS = "libdaemon"
DEPS = "dbus libdaemon"
###############################################################################
# Top-level Rules
@@ -77,10 +77,20 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --with-avahi-user=avahi \
--disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 \
--disable-pygtk --disable-python-dbus --disable-mono \
--disable-monodoc --with-distro=none --sysconfdir=/etc
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--with-avahi-user=avahi \
--disable-qt3 \
--disable-qt4 \
--disable-gtk \
--disable-gtk3 \
--disable-pygtk \
--disable-python-dbus \
--disable-mono \
--disable-monodoc \
--with-distro=none
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cp -avf $(DIR_SRC)/config/avahi/avahi /etc/init.d/

View File

@@ -22,6 +22,13 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
# Create Username and group.
getent group avahi >/dev/null || groupadd -r avahi
getent passwd avahi >/dev/null || \
useradd -r -g avahi -d /var/run/avahi-daemon -s /sbin/nologin \
-c "Avahi mDNS daemon" avahi
extract_files
ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi
ln -svf ../init.d/avahi /etc/rc.d/rc0.d/K35avahi