From 487481d48f8fd6c9cce77711e92d3bc9786a8fe1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 17 Jun 2017 10:21:41 -0700 Subject: relayd: Fix build with hardening flags and glibc Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../0001-rtnl_flush-Error-on-failed-write.patch | 34 ++++++++++++++++++++++ .../recipes-connectivity/relayd/relayd_git.bb | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch (limited to 'meta-networking/recipes-connectivity') diff --git a/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch b/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch new file mode 100644 index 0000000000..eaaf30460f --- /dev/null +++ b/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch @@ -0,0 +1,34 @@ +From 2fa326b26dc479942367dc4283e2f87372403988 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Jun 2017 09:32:04 -0700 +Subject: [PATCH] rtnl_flush: Error on failed write() + +Fixes +route.c:45:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] +| write(fd, "-1", 2); +| ^~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + route.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/route.c b/route.c +index c552d1f..fc5c31e 100644 +--- a/route.c ++++ b/route.c +@@ -42,7 +42,8 @@ static void rtnl_flush(void) + if (fd < 0) + return; + +- write(fd, "-1", 2); ++ if (write(fd, "-1", 2) < 0 ) ++ perror("write"); + close(fd); + } + +-- +2.13.1 + diff --git a/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-networking/recipes-connectivity/relayd/relayd_git.bb index ef28d2c424..98dc41a093 100644 --- a/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab DEPENDS = "libubox" -SRC_URI = "git://git.openwrt.org/project/relayd.git" +SRC_URI = "git://git.openwrt.org/project/relayd.git \ + file://0001-rtnl_flush-Error-on-failed-write.patch \ +" SRCREV = "ad0b25ad74345d367c62311e14b279f5ccb8ef13" PV = "0.0.1+git${SRCPV}" -- cgit 1.2.3-korg