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 206146aa2fd0109795ac9d0f0f0b47a2016ba8a2..7413f56f1f9f964d56ab148b2705cc76ad018c53 100755 (executable)
--- a/config/avahi/avahi
+++ b/config/avahi/avahi
@@ -18,7 +18,7 @@ case "$1" in
 
        stop)
                boot_mesg "Stopping avahi..."
 
        stop)
                boot_mesg "Stopping avahi..."

-               killproc /usr/sbin/avahi-daemon -k
+               /usr/sbin/avahi-daemon -k

                ;;
 
        reload)
                ;;
 
        reload)

diff --git a/lfs/avahi b/lfs/avahi
index 88263a19a885cc602b687b950a5989e3dd15c361..0ffbd32499a649d0d50a38cba20052c9742e71a0 100644 (file)
--- 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
 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
 
 ###############################################################################
 # 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)
 $(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/
        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 bcbb63168b1865e8f2c1a36b153eaf4c4f9a7378..cb0266bae8ff4f0825b14c87f4ae55fcc61807d9 100644 (file)
--- a/src/paks/avahi/install.sh
+++ b/src/paks/avahi/install.sh
@@ -22,6 +22,13 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /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
 extract_files
 ln -svf  ../init.d/avahi /etc/rc.d/rc3.d/S65avahi
 ln -svf  ../init.d/avahi /etc/rc.d/rc0.d/K35avahi