3 files changed, 72 insertions, 9 deletions

diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch
index 93ef007f86..80126a870d 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch
+++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch
@@ -1,4 +1,4 @@
-From f2a2b9f445ab1e31fbb27a74744e9a2ededfce17 Mon Sep 17 00:00:00 2001
+From 46fc0e197598579dc05e42f137e84f86a9b926e9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 4 Nov 2019 16:38:04 -0800
 Subject: [PATCH] Makefile.am: Avoid redirection of input and output files
@@ -15,26 +15,24 @@ make[1]: *** [Makefile:3544: monitor/iwmon.1] Error 1
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  Makefile.am | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 823b7d02..1bd0005c 100644
+index 8c69d9f4..35a25fc0 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -626,8 +626,9 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
+@@ -629,8 +629,9 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
                 < $< > $@
  
  if RUN_RST2MAN
 -RST2MAN_PROCESS = $(AM_V_GEN)$(RST2MAN) --strict --no-raw --no-generator \
--                       --no-datestamp < $< > $@
+-                       --no-datestamp $< $@
 +RST2MAN_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 +                       $(AM_V_GEN)$(RST2MAN) --strict --no-raw \
 +                       --no-generator --no-datestamp $< $@
  else
  RST2MAN_PROCESS = $(AM_V_GEN)test -f $@ || \
                 { echo "Generated manual page $@ does not exist"; false; }
--- 
-2.24.0
-
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch
new file mode 100644
index 0000000000..733f5fea1b
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch
@@ -0,0 +1,62 @@
+From fcdddf2b726439e049992878f90da607414a1a47 Mon Sep 17 00:00:00 2001
+From: Denis Kenzior <denkenz@gmail.com>
+Date: Mon, 3 Feb 2020 11:54:28 -0600
+Subject: [PATCH] build: Support missing rawmemchr
+
+rawmemchr is a GNU extension in glibc that does not exist in musl.
+
+Upstream-status: Backport of https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=fcdddf2b726439e049992878f90da607414a1a47
+
+Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
+
+---
+ configure.ac  |  1 +
+ src/missing.h | 10 ++++++++++
+ src/wiphy.c   |  1 +
+ 3 files changed, 12 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5ae1401cae17..2d373a47ba68 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -128,6 +128,7 @@ AC_DEFINE_UNQUOTED(WIRED_STORAGEDIR, "${wired_storagedir}",
+                        [Directory for Ethernet daemon storage files])
+ 
+ AC_CHECK_FUNCS(explicit_bzero)
++AC_CHECK_FUNCS(rawmemchr)
+ 
+ AC_CHECK_HEADERS(linux/types.h linux/if_alg.h)
+ 
+diff --git a/src/missing.h b/src/missing.h
+index 2bb210ae3c81..2cc80aee5d38 100644
+--- a/src/missing.h
++++ b/src/missing.h
+@@ -27,3 +27,13 @@ static inline void explicit_bzero(void *s, size_t n)
+         __asm__ __volatile__ ("" : : "r"(s) : "memory");
+ }
+ #endif
++
++#ifndef HAVE_RAWMEMCHR
++static inline void *rawmemchr(const void *s, int c)
++{
++_Pragma("GCC diagnostic push")
++_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"")
++       return memchr(s, c, (size_t) -1);
++_Pragma("GCC diagnostic pop")
++}
++#endif
+diff --git a/src/wiphy.c b/src/wiphy.c
+index 1da479db2dab..511bb27f52b8 100644
+--- a/src/wiphy.c
++++ b/src/wiphy.c
+@@ -37,6 +37,7 @@
+ 
+ #include "linux/nl80211.h"
+ 
++#include "src/missing.h"
+ #include "src/iwd.h"
+ #include "src/module.h"
+ #include "src/ie.h"
+-- 
+2.21.0
+
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb
index cc34ca2215..ed8f21ac1b 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb
@@ -4,12 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
 
 inherit autotools pkgconfig systemd python3native
 
-DEPENDS = "ell readline dbus python3-docutils-native"
+DEPENDS = "ell readline python3-docutils-native"
 
 SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
            file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \
+           file://0001-build-Support-missing-rawmemchr.patch \
           "
-SRCREV = "971e1d2038a203ad43bd2278a811a9e5ec8d52db"
+SRCREV = "860fa4697f349da7791ecf22ca76f9ac0e5de261"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
@@ -32,6 +33,8 @@ FILES_${PN} += "${datadir}/dbus-1 ${nonarch_libdir}/modules-load.d ${systemd_uni
 
 SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}"
 
+RDEPENDS_${PN} = "dbus"
+
 RRECOMMENDS_${PN} = "\
     kernel-module-pkcs7-message \
     kernel-module-pkcs8-key-parser \