version 0.6.31-1

5 files changed, 119 insertions, 44 deletions

diff --git a/.AURINFO b/.AURINFO
new file mode 100644
index 000000000000..72ef57c1cbeb
--- /dev/null
+++ b/.AURINFO
@@ -0,0 +1,53 @@
+pkgbase = avahi-nosystemd
+	pkgdesc = Multicast/unicast DNS-SD framework
+	pkgver = 0.6.31
+	pkgrel = 1
+	url = http://www.avahi.org/
+	install = avahi.install
+	arch = i686
+	arch = x86_64
+	license = LGPL
+	makedepends = qt4
+	makedepends = pygtk
+	makedepends = mono
+	makedepends = intltool
+	makedepends = python2-dbus
+	makedepends = gtk-sharp-2
+	makedepends = gobject-introspection
+	makedepends = gtk3
+	makedepends = xmltoman
+	depends = expat
+	depends = libdaemon
+	depends = glib2
+	depends = libcap
+	depends = gdbm
+	depends = dbus
+	optdepends = gtk3: avahi-discover-standalone, bshell, bssh, bvnc
+	optdepends = gtk2: gtk2 bindings
+	optdepends = qt4: qt4 bindings
+	optdepends = pygtk: avahi-bookmarks, avahi-discover
+	optdepends = twisted: avahi-bookmarks
+	optdepends = mono: mono bindings
+	optdepends = python2-dbus: avahi-discover
+	optdepends = nss-mdns: NSS support for mDNS
+	provides = avahi=0.6.31
+	provides = howl
+	provides = mdnsresponder
+	conflicts = avahi
+	conflicts = howl
+	conflicts = mdnsresponder
+	replaces = avahi
+	replaces = howl
+	replaces = mdnsresponder
+	source = http://www.avahi.org/download/avahi-0.6.31.tar.gz
+	source = rc.d.patch
+	options = !emptydirs
+	backup = etc/avahi/hosts
+	backup = etc/avahi/avahi-daemon.conf
+	backup = etc/avahi/services/ssh.service
+	backup = etc/avahi/services/sftp-ssh.service
+	backup = usr/lib/avahi/service-types.db
+	backup = usr/share/avahi/service-types
+
+pkgname = avahi-nosystemd
+
diff --git a/.SRCINFO b/.SRCINFO
index 98f16fa29fb3..0fa3e2ddd12c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = avahi-nosystemd
-	pkgdesc = Multicast DNS-SD / Zeroconf Suite
+	pkgdesc = Multicast/unicast DNS-SD framework
 	pkgver = 0.6.31
-	pkgrel = 2
+	pkgrel = 1
 	url = http://www.avahi.org/
 	install = avahi.install
 	arch = i686
@@ -16,7 +16,6 @@ pkgbase = avahi-nosystemd
 	makedepends = gobject-introspection
 	makedepends = gtk3
 	makedepends = xmltoman
-	makedepends = git
 	depends = expat
 	depends = libdaemon
 	depends = glib2
@@ -27,7 +26,7 @@ pkgbase = avahi-nosystemd
 	optdepends = gtk2: gtk2 bindings
 	optdepends = qt4: qt4 bindings
 	optdepends = pygtk: avahi-bookmarks, avahi-discover
-	optdepends = python2-twisted: avahi-bookmarks
+	optdepends = twisted: avahi-bookmarks
 	optdepends = mono: mono bindings
 	optdepends = python2-dbus: avahi-discover
 	optdepends = nss-mdns: NSS support for mDNS
@@ -47,12 +46,10 @@ pkgbase = avahi-nosystemd
 	backup = etc/avahi/services/sftp-ssh.service
 	backup = usr/lib/avahi/service-types.db
 	backup = usr/share/avahi/service-types
-	source = git+https://github.com/heftig/avahi#commit=573e3b5
-	source = avahi-daemon.rc
-	source = avahi-dnsconfd.rc
-	sha1sums = SKIP
-	sha1sums = 2f580771e008ed09e9c6caf5ee0a2707a6f04ded
-	sha1sums = c14d281a023b2c3ed834a107ad1e7f13c5c7469a
+	source = http://www.avahi.org/download/avahi-0.6.31.tar.gz
+	source = rc.d.patch
+	sha1sums = 7e05bd78572c9088b03b1207a0ad5aba38490684
+	sha1sums = d40050547c5637e77ef51fcf11936f0724bd7844
 
 pkgname = avahi-nosystemd
 
diff --git a/PKGBUILD b/PKGBUILD
index 0ac7523cac4d..376e6afd35bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,11 @@
 # Maintainer: Alexey D. <lq07829icatm@rambler.ru>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=avahi-nosystemd
 pkgver=0.6.31
-pkgrel=2
-_commit=573e3b5
-pkgdesc='Multicast DNS-SD / Zeroconf Suite'
+pkgrel=1
+pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
 arch=('i686' 'x86_64')
@@ -17,7 +15,7 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
             'qt4: qt4 bindings'
             'pygtk: avahi-bookmarks, avahi-discover'
-            'python2-twisted: avahi-bookmarks'
+            'twisted: avahi-bookmarks'
             'mono: mono bindings'
             'python2-dbus: avahi-discover'
             'nss-mdns: NSS support for mDNS')
@@ -25,31 +23,32 @@ provides=("avahi=${pkgver}" 'howl' 'mdnsresponder')
 replaces=('avahi' 'howl' 'mdnsresponder')
 conflicts=('avahi' 'howl' 'mdnsresponder')
 makedepends=('qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
-             'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman' 'git')
+             'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 backup=('etc/avahi/hosts'
         'etc/avahi/avahi-daemon.conf'
         'etc/avahi/services/ssh.service'
         'etc/avahi/services/sftp-ssh.service'
         'usr/lib/avahi/service-types.db'
         'usr/share/avahi/service-types')
-source=("git+https://github.com/heftig/avahi#commit=$_commit"
-        avahi-daemon.rc
-        avahi-dnsconfd.rc)
-sha1sums=('SKIP'
-          '2f580771e008ed09e9c6caf5ee0a2707a6f04ded'
-          'c14d281a023b2c3ed834a107ad1e7f13c5c7469a')
+source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
+        rc.d.patch)
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
+          'd40050547c5637e77ef51fcf11936f0724bd7844')
 
 install=avahi.install
 
 prepare() {
-	cd avahi
+	cd "${srcdir}/avahi-${pkgver}"
+	sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
+	sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
+	sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
+	sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
 
-	NOCONFIGURE=1 ./autogen.sh
+	patch -p1 -i ../rc.d.patch
 }
 
 build() {
-	cd avahi
-
+	cd "${srcdir}/avahi-${pkgver}"
 	export MOC_QT4=/usr/bin/moc-qt4
 	export PYTHON=/usr/bin/python2
 
@@ -65,26 +64,17 @@ build() {
 		--with-distro=archlinux \
 		--with-avahi-priv-access-group=network \
 		--with-autoipd-user=avahi \
-		--with-autoipd-group=avahi
-
-	cp -a avahi-python/avahi avahi-python/avahi3
+		--with-autoipd-group=avahi \
+		--with-systemdsystemunitdir=/usr/lib/systemd/system \
 
 	make
-	make -C avahi-python/avahi3 PYTHON=/usr/bin/python3
 }
 
 package() {
-	cd avahi
-
+	cd "${srcdir}/avahi-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	make DESTDIR="$pkgdir" -C avahi-python/avahi3 install \
-		PYTHON=/usr/bin/python3 pythondir=/usr/lib/python3.4/site-packages
 
 	# howl and mdnsresponder compatability
-	ln -s avahi-compat-howl "$pkgdir/usr/include/howl"
-	ln -s avahi-compat-howl.pc "$pkgdir/usr/lib/pkgconfig/howl.pc"
-
-	# install rc scripts
-	install -Dm755 "$srcdir"/avahi-daemon.rc "$pkgdir"/etc/rc.d/avahi-daemon
-	install -Dm755 "$srcdir"/avahi-dnsconfd.rc "$pkgdir"/etc/rc.d/avahi-dnsconfd
+	cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl
+	cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
 }
diff --git a/avahi.install b/avahi.install
index b6bdc30fb45f..2ede3a48aaa9 100644
--- a/avahi.install
+++ b/avahi.install
@@ -1,8 +1,6 @@
 post_install() {
-	if ! getent passwd avahi &>/dev/null; then
-		groupadd -r -g 84 avahi
-		useradd -r -u 84 -g avahi -d / -s /bin/nologin -c avahi av
-	fi
+	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:
@@ -14,3 +12,9 @@ EOF
 
 	true
 }
+
+post_remove() {
+	getent passwd avahi &>/dev/null && userdel avahi >/dev/null
+	getent group avahi &>/dev/null && groupdel avahi >/dev/null
+	true
+}
diff --git a/rc.d.patch b/rc.d.patch
new file mode 100644
index 000000000000..a043de49241a
--- /dev/null
+++ b/rc.d.patch
@@ -0,0 +1,31 @@
+diff -aur a/initscript/archlinux/avahi-daemon.in b/initscript/archlinux/avahi-daemon.in
+--- a/initscript/archlinux/avahi-daemon.in	2010-08-26 04:51:39.034153001 +0400
++++ b/initscript/archlinux/avahi-daemon.in	2014-08-02 09:07:53.468117966 +0400
+@@ -26,13 +26,14 @@
+ . /etc/rc.conf
+ . /etc/rc.d/functions
+ 
+-PATH=/sbin:/bin:/usr/sbin:/usr/bin
++PATH=/usr/bin
+ DESC="Avahi mDNS/DNS-SD Daemon"
+ NAME="avahi-daemon"
+ DAEMON="@sbindir@/$NAME"
+ 
+ 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
+diff -aur a/initscript/archlinux/avahi-dnsconfd.in b/initscript/archlinux/avahi-dnsconfd.in
+--- a/initscript/archlinux/avahi-dnsconfd.in	2010-08-26 04:51:39.035153001 +0400
++++ b/initscript/archlinux/avahi-dnsconfd.in	2014-08-02 09:08:15.898117665 +0400
+@@ -26,7 +26,7 @@
+ . /etc/rc.conf
+ . /etc/rc.d/functions
+ 
+-PATH=/sbin:/bin:/usr/sbin:/usr/bin
++PATH=/usr/bin
+ DESC="Avahi mDNS/DNS-SD DNS Server Configuration Daemon"
+ NAME="avahi-dnsconfd"
+ DAEMON="@sbindir@/$NAME"