avahi-server 0.6.31-1 màj port

(cherry picked from commit 02c40a6206fd70ebddf39196015df65cea449057)

6 files changed, 34 insertions, 84 deletions

diff --git a/avahi-server/.footprint.i686 b/avahi-server/.footprint.i686
index 37c10e0dc..d8875ae7b 100644
--- a/avahi-server/.footprint.i686
+++ b/avahi-server/.footprint.i686
@@ -9,21 +9,23 @@ drwxr-xr-x	root/root	etc/avahi/services/
 -rw-r--r--	root/root	etc/avahi/services/ssh.service
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/avahid
+-rwxr-xr--	root/root	etc/rc.d/init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K28avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K28avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K28avahi -> ../init.d/avahi
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
+drwxr-xr-x	root/root	etc/sysconfig/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/avahi-autoipd
diff --git a/avahi-server/.footprint.x86_64 b/avahi-server/.footprint.x86_64
index 37c10e0dc..d8875ae7b 100644
--- a/avahi-server/.footprint.x86_64
+++ b/avahi-server/.footprint.x86_64
@@ -9,21 +9,23 @@ drwxr-xr-x	root/root	etc/avahi/services/
 -rw-r--r--	root/root	etc/avahi/services/ssh.service
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/avahid
+-rwxr-xr--	root/root	etc/rc.d/init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K28avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K28avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S43avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S34avahi -> ../init.d/avahi
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K13avahid -> ../init.d/avahid
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K28avahi -> ../init.d/avahi
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
+drwxr-xr-x	root/root	etc/sysconfig/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/avahi-autoipd
diff --git a/avahi-server/.md5sum.i686 b/avahi-server/.md5sum.i686
index fd08362a3..90045187f 100644
--- a/avahi-server/.md5sum.i686
+++ b/avahi-server/.md5sum.i686
@@ -1,2 +1 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
-09877d8619de924d02bc018bcef21150  avahid
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
diff --git a/avahi-server/.md5sum.x86_64 b/avahi-server/.md5sum.x86_64
index fd08362a3..90045187f 100644
--- a/avahi-server/.md5sum.x86_64
+++ b/avahi-server/.md5sum.x86_64
@@ -1,2 +1 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
-09877d8619de924d02bc018bcef21150  avahid
+2f22745b8f7368ad5a0a3fddac343f2d  avahi-0.6.31.tar.gz
diff --git a/avahi-server/Pkgfile b/avahi-server/Pkgfile
index b35710acb..899ee6860 100644
--- a/avahi-server/Pkgfile
+++ b/avahi-server/Pkgfile
@@ -2,17 +2,22 @@
 # URL: http://www.avahi.org/
 # Maintainer: NuTyX core team 
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libdaemon,intltool,dbus,dbus-python
-# Run on: libdaemon,dbus,dbus-python
+# Depends on: libdaemon, intltool, dbus, dbus-python, avahi
+# Run on: libdaemon,dbus,dbus-python,avahi
 
 name=avahi-server
-version=0.6.30
-release=3
-source=(http://www.avahi.org/download/avahi-$version.tar.gz
-	avahid)
+version=0.6.31
+release=1
+source=(http://www.avahi.org/download/avahi-$version.tar.gz)
 
 build() {
-	cd avahi-$version
+	source /etc/blfs-bootscripts
+	wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+	tar xf $scripts-$scriptsversion.tar.bz2
+	cd $scripts-$scriptsversion
+	make DESTDIR=$PKG install-avahi
+
+	cd ../avahi-$version
 	PYTHON=python2 ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -41,15 +46,5 @@ build() {
 		make -C $i
 		make -C $i DESTDIR=$PKG install
 	done
-
-	mkdir -p $PKG/etc/rc.d/{init.d,rc{0,1,2,3,4,5,6}.d}
-        install -D -m755 ../avahid $PKG/etc/rc.d/init.d/avahid
-
-	for i in 3 4 5; do
-		ln -svf ../init.d/avahid $PKG/etc/rc.d/rc$i.d/S43avahid
-	done
-	for i in 0 1 2 6; do
-		ln -svf ../init.d/avahid $PKG/etc/rc.d/rc$i.d/K13avahid
-	done
 	rm -rf $PKG/{lib,etc/dbus-1,usr/share/{avahi,dbus-1,man/man{1,5}}}
 }
diff --git a/avahi-server/avahid b/avahi-server/avahid
deleted file mode 100644
index 3ab580e5f..000000000
--- a/avahi-server/avahid
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/avahid
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-# Add create user and Groups - thierryn1@hispeed.ch
-
-# $Id: $
-
-. /etc/sysconfig/rc
-. $rc_functions
-newgroup=avahi
-newuser=avahi
-newid=85
-getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup
-getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \
--u $newid -s /bin/false -c "Avahi Daemon" $newuser
-
-
-case "$1" in
-    start)
-        boot_mesg "Starting Avahi Daemon..."
-        loadproc /usr/sbin/avahi-daemon -D
-        ;;
-
-    stop)
-        boot_mesg "Stopping Avahi Daemon..."
-        killproc /usr/sbin/avahi-daemon
-        ;;
-
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-
-    status)
-        statusproc /usr/sbin/avahi-daemon
-        ;;
-
-    *)
-        echo "Usage: $0 {start|stop|restart|status}"
-        exit 1
-        ;;
-esac
-
-# End $rc_base/init.d/avahid