avahi: patch systemd runtime_dir change in 0.7
authorJeremiah McConnell <miah@miah.com>
Fri, 15 Jun 2018 21:26:19 +0000 (15:26 -0600)
committerJeremiah McConnell <miah@miah.com>
Fri, 15 Jun 2018 21:26:19 +0000 (15:26 -0600)
In avahi 0.7 the runtime_dir was updated to be /run instead of /var/run
for better systemd compatibility.  Patch out that change to fix
avahi-daemon.

Signed-off-by: Jeremiah McConnell <miah@miah.com>
libs/avahi/Makefile
libs/avahi/patches/020-revert-runtime-dir-systemd-change.patch [new file with mode: 0644]

index 3f6407e2b01ada8ecce5723473e301c899131e35..a4955e318b9ca953b33eb5e4b9cdd423510dbf97 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi
 PKG_VERSION:=0.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSION) \
diff --git a/libs/avahi/patches/020-revert-runtime-dir-systemd-change.patch b/libs/avahi/patches/020-revert-runtime-dir-systemd-change.patch
new file mode 100644 (file)
index 0000000..a3b3cc6
--- /dev/null
@@ -0,0 +1,26 @@
+From ef0ea001f6dd13d6a2e0bc17d13f595d2829f8a8 Mon Sep 17 00:00:00 2001
+From: Jeremiah McConnell <miah@miah.com>
+Date: Fri, 15 Jun 2018 11:31:10 -0600
+Subject: [PATCH] move runtime_dir to /var/run
+
+Upstream transitioned to using /run as runtime_dir for 0.7.  Revert
+that change for procd compatibility.
+
+Signed-off-by: Jeremiah McConnell <miah@miah.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 72d61478..8f6e9768 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -984,7 +984,7 @@ AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_GROUP,"$AVAHI_AUTOIPD_GROUP", [Group for runnin
+ #
+ # Avahi runtime dir
+ #
+-avahi_runtime_dir="/run"
++avahi_runtime_dir="${localstatedir}/run"
+ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
+ AC_SUBST(avahi_runtime_dir)
+ AC_SUBST(avahi_socket)