avahi: fix mDNS hostname resolution

5 files changed, 37 insertions, 9 deletions

diff --git a/avahi/.footprint b/avahi/.footprint
index 397ed734e..7d0680e7a 100644
--- a/avahi/.footprint
+++ b/avahi/.footprint
@@ -12,7 +12,6 @@ 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/
 -rwxr-xr-x	root/root	etc/rc.d/avahi-daemon
-drwxr-xr-x	root/root	run/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/avahi-browse
@@ -154,3 +153,5 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -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	var/
+drwxr-xr-x	root/root	var/run/
diff --git a/avahi/.signature b/avahi/.signature
index 6892d4662..bcb754c41 100644
--- a/avahi/.signature
+++ b/avahi/.signature
@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34ygUB6TTO5Vw/uyL7lNiK5FzAGhlf8ANFLm2cpAr1sxcDBA9avHhJHJN3/CWQI2qGv0qKD7mBjlj9dWVT32AAY=
-SHA256 (Pkgfile) = de7552127911c8c92d4f504af47a8274325f661a8241b08b8b41557d8493437f
-SHA256 (.footprint) = be4f80c64d9725c4038b55c57a7796fbc2c4b9ddf68b23ecc6b4ad2682408f95
+RWSagIOpLGJF3zlbdB6Cb8TtdgzC/27PnQ+32gbedrRrI6nBWAU1wBzzxJsp3xYs53BJzm3OZ12k422cx/rldflVBYGw5675FwM=
+SHA256 (Pkgfile) = eb1974618a626921a8653ab223d3f04b878eb76e21409922e525e8125f41d83e
+SHA256 (.footprint) = 1fb2869bcc25f931b80210cc5aaee89579657e84aa51651e443fcac6aa3bba2c
 SHA256 (avahi-0.7.tar.gz) = 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
-SHA256 (avahi-daemon.rc) = 86bf0f7caa9e6a9571b7185ca736f214d184dfe81990cb3350b8db184de34196
+SHA256 (avahi-daemon.rc) = 032e83dd665f95436234309226c11d31231ab4fd7689c9d6cf64efbf8d3db8a3
+SHA256 (reverse-move-to-run.patch) = a333bcf15dd3e72ac99b2e883202e7170d2ff27bf61820413235bc9f3c9c2605
diff --git a/avahi/Pkgfile b/avahi/Pkgfile
index 8cbfe5e4f..c66597e03 100644
--- a/avahi/Pkgfile
+++ b/avahi/Pkgfile
@@ -5,14 +5,17 @@
 
 name=avahi
 version=0.7
-release=4
+release=5
 source=(http://avahi.org/download/$name-$version.tar.gz \
-  avahi-daemon.rc)
+  avahi-daemon.rc reverse-move-to-run.patch)
 
 build() {
   cd $name-$version
+  patch -Np1 -i ../reverse-move-to-run.patch
+  NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
+    --localstatedir=/var \
     --with-distro=none \
     --disable-gtk \
     --disable-gtk3 \
diff --git a/avahi/avahi-daemon.rc b/avahi/avahi-daemon.rc
index e3fc4eaba..c23681382 100644
--- a/avahi/avahi-daemon.rc
+++ b/avahi/avahi-daemon.rc
@@ -5,7 +5,7 @@
 
 SSD=/sbin/start-stop-daemon
 PROG=/usr/sbin/avahi-daemon
-PID=/run/avahi-daemon/pid
+PID=/var/run/avahi-daemon/pid
 OPTS="-D"
 
 case $1 in
@@ -13,7 +13,7 @@ case $1 in
 		$SSD --start --pidfile $PID --exec $PROG -- $OPTS
 		;;
 	stop)
-		$SSD --stop --retry 10 --pidfile $PID
+		$SSD --stop --retry 10 --name avahi-daemon --pidfile $PID
 		;;
 	restart)
 		$0 stop
diff --git a/avahi/reverse-move-to-run.patch b/avahi/reverse-move-to-run.patch
new file mode 100644
index 000000000..2ad748372
--- /dev/null
+++ b/avahi/reverse-move-to-run.patch
@@ -0,0 +1,23 @@
+From 60bd97ceeb1f7924df2b347b5ac18fa5949898cc Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 28 Jan 2016 00:26:34 +0100
+Subject: [PATCH] Move to /run
+
+on modern, systemd based systems, the default directory is /run, no longer /var/run
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 607d3343..6c353c35 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -957,7 +957,7 @@ AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_GROUP,"$AVAHI_AUTOIPD_GROUP", [Group for runnin
+ #
+ # Avahi runtime dir
+ #
++avahi_runtime_dir="${localstatedir}/run"
+-avahi_runtime_dir="/run"
+ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
+ AC_SUBST(avahi_runtime_dir)
+ AC_SUBST(avahi_socket)