diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-12 14:14:44 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-12 14:14:44 +0000 |
| commit | ec9bd2e246eb94181a9254dcb2de7ddc191bb8cc (patch) | |
| tree | 2f7af52e79332c2dc24b2c28ac3fceb0cbda7f10 /extra/avahi | |
| parent | e03f4b9bc9da3327de94bc58aa92ecb836c1580d (diff) | |
Tue Jul 12 14:14:44 UTC 2011
Diffstat (limited to 'extra/avahi')
| -rw-r--r-- | extra/avahi/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/avahi/install | 21 | ||||
| -rw-r--r-- | extra/avahi/rc.d.patch | 11 |
3 files changed, 40 insertions, 8 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 63f079778..812aeeaa0 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126809 2011-06-07 12:12:31Z bisson $ +# $Id: PKGBUILD 128481 2011-06-24 03:51:45Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.30 -pkgrel=3 +pkgrel=4 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64') url='http://www.avahi.org/' @@ -22,23 +22,23 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 'gobject-introspection' 'gtk3') backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) -install=avahi.install +install=install conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') replaces=('howl' 'mdnsresponder') options=('!libtool') source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" - 'avahi-daemon-dbus.patch' - 'gnome-nettool.png') + 'gnome-nettool.png' + 'rc.d.patch') sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' - '36735096a6eeb3a4012fe14f875259ee8558e220' - 'cf56387c88aed246b9f435efc182ef44de4d52f3') + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i "../avahi-daemon-dbus.patch" + patch -p1 -i "../rc.d.patch" # pygtk requires python2; make it explicit in case other python are installed: FS#21865 PYTHON=python2 \ diff --git a/extra/avahi/install b/extra/avahi/install new file mode 100644 index 000000000..7c75c3dd4 --- /dev/null +++ b/extra/avahi/install @@ -0,0 +1,21 @@ +post_install() { + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + + cat <<EOF +==> The following daemons may be added to DAEMONS in /etc/rc.conf: +==> avahi-daemon: the mdns responder, you probably want this. +==> dbus needs to be running when you start it. +==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns +==> configuration on dhcp-less networks. + +==> To use some of the client applications you will have to install python. +==> In addition, pygtk is required for the graphical ones and +==> twisted for avahi-bookmarks. +EOF +} + +post_remove() { + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null +} diff --git a/extra/avahi/rc.d.patch b/extra/avahi/rc.d.patch new file mode 100644 index 000000000..fd735734b --- /dev/null +++ b/extra/avahi/rc.d.patch @@ -0,0 +1,11 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 +@@ -33,6 +33,7 @@ + + case "$1" in + start) ++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then |