summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-05-18 21:26:17 +0200
committertnut <thierryn1 at hispeed dot ch>2010-05-18 21:26:17 +0200
commitc589f2eca8bd0df629d2a1f8797e2025556a232f (patch)
treeb4a91ffb018a9045abf4ebe87d15b1339c909d71
parentcf4ac3eea6264ad62e9bfbd9b67bb48c5d70ac45 (diff)
downloadnutyx-pakxe-c589f2eca8bd0df629d2a1f8797e2025556a232f.tar.gz
nutyx-pakxe-c589f2eca8bd0df629d2a1f8797e2025556a232f.tar.bz2
nutyx-pakxe-c589f2eca8bd0df629d2a1f8797e2025556a232f.tar.xz
nutyx-pakxe-c589f2eca8bd0df629d2a1f8797e2025556a232f.zip
avahi, séparation client et service
-rw-r--r--extra/avahi/.footprint36
-rw-r--r--extra/avahi/.md5sum1
-rw-r--r--extra/avahi/Pkgfile17
-rw-r--r--extra/avahi/avahid47
4 files changed, 4 insertions, 97 deletions
diff --git a/extra/avahi/.footprint b/extra/avahi/.footprint
index 4ad83ae8d..83fff687b 100644
--- a/extra/avahi/.footprint
+++ b/extra/avahi/.footprint
@@ -1,30 +1,7 @@
drwxr-xr-x root/root etc/
-drwxr-xr-x root/root etc/avahi/
--rwxr-xr-x root/root etc/avahi/avahi-autoipd.action
--rw-r--r-- root/root etc/avahi/avahi-daemon.conf
--rwxr-xr-x root/root etc/avahi/avahi-dnsconfd.action
--rw-r--r-- root/root etc/avahi/hosts
-drwxr-xr-x root/root etc/avahi/services/
--rw-r--r-- root/root etc/avahi/services/sftp-ssh.service
--rw-r--r-- root/root etc/avahi/services/ssh.service
drwxr-xr-x root/root etc/dbus-1/
drwxr-xr-x root/root etc/dbus-1/system.d/
-rw-r--r-- root/root etc/dbus-1/system.d/avahi-dbus.conf
-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
-drwxr-xr-x root/root etc/rc.d/rc0.d/
-lrwxrwxrwx root/root etc/rc.d/rc0.d/K13avahid -> ../init.d/avahid
-drwxr-xr-x root/root etc/rc.d/rc1.d/
-lrwxrwxrwx root/root etc/rc.d/rc1.d/K13avahid -> ../init.d/avahid
-drwxr-xr-x root/root etc/rc.d/rc3.d/
-lrwxrwxrwx root/root etc/rc.d/rc3.d/S43avahid -> ../init.d/avahid
-drwxr-xr-x root/root etc/rc.d/rc4.d/
-lrwxrwxrwx root/root etc/rc.d/rc4.d/S43avahid -> ../init.d/avahid
-drwxr-xr-x root/root etc/rc.d/rc5.d/
-lrwxrwxrwx root/root etc/rc.d/rc5.d/S43avahid -> ../init.d/avahid
-drwxr-xr-x root/root etc/rc.d/rc6.d/
-lrwxrwxrwx root/root etc/rc.d/rc6.d/K13avahid -> ../init.d/avahid
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/avahi-bookmarks
@@ -164,10 +141,6 @@ drwxr-xr-x root/root usr/lib/python2.6/site-packages/avahi/
-rw-r--r-- root/root usr/lib/python2.6/site-packages/avahi/__init__.pyc
-rw-r--r-- root/root usr/lib/python2.6/site-packages/avahi/__init__.pyo
drwxr-xr-x root/root usr/lib/python2.6/site-packages/avahi_discover/
-drwxr-xr-x root/root usr/sbin/
--rwxr-xr-x root/root usr/sbin/avahi-autoipd
--rwxr-xr-x root/root usr/sbin/avahi-daemon
--rwxr-xr-x root/root usr/sbin/avahi-dnsconfd
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/bssh.desktop
@@ -210,14 +183,5 @@ drwxr-xr-x root/root usr/share/man/man5/
-rw-r--r-- root/root usr/share/man/man5/avahi-daemon.conf.5.gz
-rw-r--r-- root/root usr/share/man/man5/avahi.hosts.5.gz
-rw-r--r-- root/root usr/share/man/man5/avahi.service.5.gz
-drwxr-xr-x root/root usr/share/man/man8/
--rw-r--r-- root/root usr/share/man/man8/avahi-autoipd.8.gz
--rw-r--r-- root/root usr/share/man/man8/avahi-autoipd.action.8.gz
--rw-r--r-- root/root usr/share/man/man8/avahi-daemon.8.gz
--rw-r--r-- root/root usr/share/man/man8/avahi-dnsconfd.8.gz
--rw-r--r-- root/root usr/share/man/man8/avahi-dnsconfd.action.8.gz
drwxr-xr-x root/root usr/share/pixmaps/
-rw-r--r-- root/root usr/share/pixmaps/network-wired.png
-drwxr-xr-x root/root var/
-drwxr-xr-x root/root var/lib/
-drwxr-xr-x root/root var/lib/run/
diff --git a/extra/avahi/.md5sum b/extra/avahi/.md5sum
index 6ce47b894..1eb56d2d1 100644
--- a/extra/avahi/.md5sum
+++ b/extra/avahi/.md5sum
@@ -1,3 +1,2 @@
a83155a6e29e3988f07e5eea3287b21e avahi-0.6.25.tar.gz
-09877d8619de924d02bc018bcef21150 avahid
42c2905307c7a5dc6ac4b75f4c3d65a3 network-wired.png
diff --git a/extra/avahi/Pkgfile b/extra/avahi/Pkgfile
index 8a62e39a0..171e0306d 100644
--- a/extra/avahi/Pkgfile
+++ b/extra/avahi/Pkgfile
@@ -7,9 +7,9 @@
name=avahi
version=0.6.25
-release=1
+release=2
source=(http://www.avahi.org/download/avahi-$version.tar.gz\
- avahid network-wired.png)
+ network-wired.png)
build() {
cd $name-$version
@@ -29,18 +29,9 @@ build() {
--enable-autoipd
make
make DESTDIR=$PKG install
- mkdir -v -p $PKG/etc/rc.d/init.d
- mkdir -v -p $PKG/etc/rc.d/rc{0,1,3,4,5,6}.d
mkdir -v -p $PKG/usr/share/pixmaps
install -m 644 ../network-wired.png \
$PKG/usr/share/pixmaps/network-wired.png
- install -D -m755 ../avahid $PKG/etc/rc.d/init.d/avahid
-
- ln -svf ../init.d/avahid $PKG/etc/rc.d/rc3.d/S43avahid
- ln -svf ../init.d/avahid $PKG/etc/rc.d/rc5.d/S43avahid
- ln -svf ../init.d/avahid $PKG/etc/rc.d/rc4.d/S43avahid
- ln -svf ../init.d/avahid $PKG/etc/rc.d/rc0.d/K13avahid
- ln -svf ../init.d/avahid $PKG/etc/rc.d/rc1.d/K13avahid
- ln -svf ../init.d/avahid $PKG/etc/rc.d/rc6.d/K13avahid
-
+ rm -r $PKG/{etc/avahi,var,usr/share/man/man8,usr/sbin}
+
}
diff --git a/extra/avahi/avahid b/extra/avahi/avahid
deleted file mode 100644
index 3ab580e5f..000000000
--- a/extra/avahi/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