From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 18 Jan 2014 22:16:43 +0000 (+0100)
Subject: avahi: Fix certain problems.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=192d43080e3026701b8de77d8b4ae2bf507c993b

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.
---

diff --git a/config/avahi/avahi b/config/avahi/avahi
index 206146aa2..7413f56f1 100755
--- a/config/avahi/avahi
+++ b/config/avahi/avahi
@@ -18,7 +18,7 @@ case "$1" in
 
 	stop)
 		boot_mesg "Stopping avahi..."
-		killproc /usr/sbin/avahi-daemon -k
+		/usr/sbin/avahi-daemon -k
 		;;
 
 	reload)
diff --git a/lfs/avahi b/lfs/avahi
index 88263a19a..0ffbd3249 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -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/
diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh
index bcbb63168..cb0266bae 100644
--- a/src/paks/avahi/install.sh
+++ b/src/paks/avahi/install.sh
@@ -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