From 66648268ab5803439aa282dd67982d520c491d56 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 18 Feb 2014 12:13:01 +0000 Subject: avahi: handle SO_REUSEPORT not being available Linux < 3.9 doesn't have the SO_REUSEPORT option so instead of failing to start when built with >=3.9 kernel headers but booted on <3.9 kernels, continue as if SO_REUSEPORT wasn't available. (From OE-Core rev: 85e89da55f778ad3713460cb0df1435d82e94510) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi.inc | 1 + .../avahi/files/reuseport-check.patch | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-connectivity/avahi/files/reuseport-check.patch (limited to 'meta/recipes-connectivity/avahi') diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 3a95b7fa1f..e4ff26a17c 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -26,6 +26,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://fix_for_automake_1.12.x.patch \ file://out-of-tree.patch \ file://0001-avahi-fix-avahi-status-command-error-prompt.patch \ + file://reuseport-check.patch \ " USERADD_PACKAGES = "avahi-daemon avahi-autoipd" diff --git a/meta/recipes-connectivity/avahi/files/reuseport-check.patch b/meta/recipes-connectivity/avahi/files/reuseport-check.patch new file mode 100644 index 0000000000..bb81c2cb4e --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/reuseport-check.patch @@ -0,0 +1,30 @@ +Fix avahi-daemon when running on kernel < 3.9 (patch taken from Ubuntu). + +Upstream-Status: Pending (unmaintained upstream) +Signed-off-by: Ross Burton + +Description: SO_REUSEPORT may not exist in running kernel + When userspace defines SO_REUSEPORT we will attempt to enable socket + port number reuse. However if the running kernel does not support + this call it will fail preventing daemon startup. If this call is + present but fails ENOPROTOOPT then we know that actually the kernel + does not support it and we should continue as if we did not have the + call at all. (LP: #1228204) + . + This patch could be removed from the debian package after jessie release. +Author: Andy Whitcroft + +Index: avahi-0.6.31/avahi-core/socket.c +=================================================================== +--- avahi-0.6.31.orig/avahi-core/socket.c 2013-09-20 16:36:50.000000000 +0100 ++++ avahi-0.6.31/avahi-core/socket.c 2013-09-20 16:38:23.781863644 +0100 +@@ -177,7 +177,8 @@ + yes = 1; + if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) < 0) { + avahi_log_warn("SO_REUSEPORT failed: %s", strerror(errno)); +- return -1; ++ if (errno != ENOPROTOOPT) ++ return -1; + } + #endif + -- cgit v1.2.3-54-g00ecf