ebtables: Fix duplicate definition errors due to netinet/ether.h

new file mode 100644
index 000000000..997c8c5d1
@@ -0,0 +1,89 @@
+From 65e6ce454751b0d38d29836fcf78a31b612e59c3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 3 Mar 2018 16:38:17 -0800
+Subject: [PATCH] re-order including netinet/ether.h
+
+Fixed duplicate definitions errors seen with glibc 2.27
+
+e.g.
+
+error: redefinition of 'struct sockaddr_in6'
+|  struct sockaddr_in6 {
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Pending
+
+ extensions/ebt_among.c    | 3 +--
+ extensions/ebt_arpreply.c | 2 +-
+ extensions/ebt_nat.c      | 2 +-
+ useful_functions.c        | 2 +-
+ 4 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c
+index b096847..e03a4e2 100644
+--- a/extensions/ebt_among.c
++++ b/extensions/ebt_among.c
+@@ -12,10 +12,9 @@
+ #include <getopt.h>
+ #include <ctype.h>
+ #include <unistd.h>
+-#include <netinet/ether.h>
+ #include "../include/ebtables_u.h"
+ #include "../include/ethernetdb.h"
+-#include <linux/if_ether.h>
++#include <netinet/ether.h>
+ #include <linux/netfilter_bridge/ebt_among.h>
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c
+index c5102a4..c3757f3 100644
+--- a/extensions/ebt_arpreply.c
++++ b/extensions/ebt_arpreply.c
+@@ -11,8 +11,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <getopt.h>
+-#include <netinet/ether.h>
+ #include "../include/ebtables_u.h"
++#include <netinet/ether.h>
+ #include <linux/netfilter_bridge/ebt_arpreply.h>
+ 
+ static int mac_supplied;
+diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c
+index 8d318d1..e6afbf8 100644
+--- a/extensions/ebt_nat.c
++++ b/extensions/ebt_nat.c
+@@ -10,8 +10,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <getopt.h>
+-#include <netinet/ether.h>
+ #include "../include/ebtables_u.h"
++#include <netinet/ether.h>
+ #include <linux/netfilter_bridge/ebt_nat.h>
+ 
+ static int to_source_supplied, to_dest_supplied;
+diff --git a/useful_functions.c b/useful_functions.c
+index c304f4d..a447db5 100644
+--- a/useful_functions.c
++++ b/useful_functions.c
+@@ -23,7 +23,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ #include <stdio.h>
+-#include <netinet/ether.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <getopt.h>
+@@ -33,6 +32,7 @@
+ #include <arpa/inet.h>
+ #include "include/ebtables_u.h"
+ #include "include/ethernetdb.h"
++#include <netinet/ether.h>
+ 
+ const unsigned char mac_type_unicast[ETH_ALEN] =   {0,0,0,0,0,0};
+ const unsigned char msk_type_unicast[ETH_ALEN] =   {1,0,0,0,0,0};
+-- 
+2.16.2
+

index d5e7341a0..7c89cffa9 100644
@@ -30,6 +30,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
            file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \
            file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \
            file://0010-Adjust-header-include-sequence.patch \
+           file://0001-re-order-including-netinet-ether.h.patch \
            "
 
 SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0"

index a11a97ebd..a72256f19 100644
@@ -1,13 +1,14 @@
-From 8f299df4dd1ca857e34859c377a29b183c630961 Mon Sep 17 00:00:00 2001
+From b7f146caf28a80ada3d45bb9903890e6dfdd5e85 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 21 Sep 2017 13:05:03 -0700
-Subject: [PATCH] l2tp_api.c: include rpc/clnt.h for 'resultproc_t'
+Subject: [PATCH 4/4] l2tp_api.c: include rpc/clnt.h for 'resultproc_t'
 
 Fixes
 
 | /mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/openl2tp/1.8-r0/recipe-sysroot/usr/include/tirpc/rpc/pmap_clnt.h:81:12: error: unknown type name 'resultproc_t'; did you mean 'rpcproc_t'?                                                 |             resultproc_t);                                                                                                                                                                                                                  |             ^~~~~~~~~~~~
 
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
 Upstream-Status: Pending
 

@@ -27,5 +28,5 @@ index f0946fd..f77881c 100644
  //#include <netinet/in.h>
  
 -- 
-2.14.1
+2.16.2
 

new file mode 100644
index 000000000..0276c6648
@@ -0,0 +1,31 @@
+From 343994e7f121bba7f16aa3b5e9c27b5aed7d1b99 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 3 Mar 2018 16:50:03 -0800
+Subject: [PATCH] plugins: Remove redundant net/ headers
+
+They cause errors with glibc 2.27
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Pending
+
+ plugins/ppp_unix.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c
+index 869066f..6a20b1a 100644
+--- a/plugins/ppp_unix.c
++++ b/plugins/ppp_unix.c
+@@ -25,9 +25,6 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <signal.h>
+-#include <net/ethernet.h>
+-#include <net/if.h>
+-#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-- 
+2.16.2
+

index 3f8bcaa48..abb09be8a 100644
@@ -1,9 +1,10 @@
-From a41cbeee3cf660663a9baac80545050a8d960898 Mon Sep 17 00:00:00 2001
+From 200b72d2dd7ff05466938c00baf055dbe7779866 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Tue, 28 Mar 2017 18:09:58 -0700
-Subject: [PATCH 2/2] user ipv6 structures
+Subject: [PATCH 3/4] user ipv6 structures
 
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
  l2tp_api.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)

@@ -29,5 +30,5 @@ index 9d6f60a..f0946fd 100644
  		svcerr_auth(xprt, AUTH_TOOWEAK);
  		return -EPERM;
 -- 
-2.12.1
+2.16.2
 

index 0fcba6546..ab5b22e01 100644
@@ -1,7 +1,7 @@
-From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001
+From 78f774faff6bd27c378c59e6685ac9b4db68c7bb Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Tue, 28 Mar 2017 11:46:56 -0700
-Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc
+Subject: [PATCH 2/4] Adjust for linux-kernel headers assumptions on glibc
 
 Fixes build issues e.g.
 

@@ -11,12 +11,13 @@ In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-
         ^
 
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
  plugins/ppp_unix.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c
-index 869066f..5c1e44f 100644
+index 6a20b1a..2e1901f 100644
 --- a/plugins/ppp_unix.c
 +++ b/plugins/ppp_unix.c
 @@ -21,6 +21,11 @@

@@ -32,5 +33,5 @@ index 869066f..5c1e44f 100644
  #include <fcntl.h>
  #include <sys/types.h>
 -- 
-2.12.1
+2.16.2
 

index bf6850b17..83e34b70a 100644
@@ -33,6 +33,7 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \
            file://openl2tpd.service \
            file://openl2tpd-enable-tests.patch \
            file://run-ptest \
+           file://0001-plugins-Remove-redundant-net-headers.patch \
            "
 
 SRC_URI_append_libc-musl = "\

new file mode 100644
index 000000000..e49528505
@@ -0,0 +1,33 @@
+From 1ce892749e4f53bd0aeaa4c3ce45f80178799411 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 3 Mar 2018 17:52:51 -0800
+Subject: [PATCH] multicast_blast/tipcc: Fix struct type for TIPC_GROUP_JOIN
+
+Kernel defines it as tipc_group_req and not tipc_mreq
+this code was not excercised with older kernels so we
+never ran into the compiler failures since TIPC_GROUP_JOIN
+is only defined in kernel starting 4.15
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Pending
+
+ multicast_blast/tipcc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/multicast_blast/tipcc.c b/multicast_blast/tipcc.c
+index 90644d3..911c759 100755
+--- a/multicast_blast/tipcc.c
++++ b/multicast_blast/tipcc.c
+@@ -213,7 +213,7 @@ int tipc_accept(int sd, struct tipc_addr *src)
+ int tipc_join(int sd, struct tipc_addr *member)
+ {
+ #ifdef TIPC_GROUP_JOIN
+-	struct tipc_mreq mreq = {
++	struct tipc_group_req mreq = {
+ 		.type = member->type,
+ 		.instance = member->instance,
+ 		.scope = domain2scope(member->domain)
+-- 
+2.16.2
+

index 720aa3c2b..54ed043f4 100644
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1
 SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \
            file://0001-include-sys-select.h-for-FD_-definitions.patch \
            file://0002-replace-non-standard-uint-with-unsigned-int.patch \
+           file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \
            "
 SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a"
 PV = "2.2.0+git${SRCPV}"

similarity index 92%
rename from meta-networking/recipes-daemons/keepalived/keepalived_1.3.5.bb
rename to meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb
index 5e7e6e49f..36417b72a 100644
@@ -11,9 +11,8 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz"
-
-SRC_URI[md5sum] = "9964d295ec9d34ed3408b57d28847b68"
-SRC_URI[sha256sum] = "c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048"
+SRC_URI[md5sum] = "610af6e04071f02d3469191de7499f4e"
+SRC_URI[sha256sum] = "4e2d7cc01a6ee29a3955f5c622d47704ba7d9dd758189f15e9def016a2d1faa3"
 
 DEPENDS = "libnfnetlink openssl"
 

deleted file mode 100644
index 711738a92..000000000
@@ -1,27 +0,0 @@
-From 2c85decc3b93bfe7322309d2ca7d6377e746c18f Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 5 Feb 2018 09:51:08 -0800
-Subject: [PATCH] include endian.h for be16toh and le16toh declarations
-
-Upstream-Status: Submitted [https://github.com/intel-iot-devkit/mraa/pull/863]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- examples/iio_driver.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/examples/iio_driver.c b/examples/iio_driver.c
-index c5a0181..568011c 100644
---- a/examples/iio_driver.c
-+++ b/examples/iio_driver.c
-@@ -22,6 +22,7 @@
-  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <endian.h>
- #include <unistd.h>
- #include "mraa/iio.h"
- 
--- 
-2.16.1
-

index 366d6b70f..930c04123 100644
@@ -9,7 +9,6 @@ SRCREV = "fbb7d9232067eac3f4508a37a8f7ea0c4fcebacb"
 PV = "1.9.0-git${SRCPV}"
 
 SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
-           file://0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch \
            "
 
 S = "${WORKDIR}/git"

similarity index 77%
rename from meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.1.bb
rename to meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb
index 8276b446d..718f3f5fd 100644
@@ -2,12 +2,12 @@ SUMMARY = "Simple DirectMedia Layer mixer library V2"
 SECTION = "libs"
 DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis"
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=29d8bc7c38aa44b1cf3a633a46589917"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=95e0c3cf63f71b950911e698a54b7fc5"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "c6c4f556d4415871f526248f5c9a627d"
-SRC_URI[sha256sum] = "5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f"
+SRC_URI[md5sum] = "aaa0551393993c14a13f72b339c0ed6c"
+SRC_URI[sha256sum] = "4e615e27efca4f439df9af6aa2c6de84150d17cbfd12174b54868c12f19c83bb"
 
 S = "${WORKDIR}/SDL2_mixer-${PV}"
 

deleted file mode 100644
index ae1b265dc..000000000
@@ -1,59 +0,0 @@
-From 46f016c4b87bb2a594df1c84e4d494bff0cbeaf9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 5 Feb 2018 12:01:25 -0800
-Subject: [PATCH] src: Replace using sys/errno.h with errno.h
-
-sys/errno.h is no longer the right place for this file
-
-error: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Werror=cpp]
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/63]
- src/NCAskForDirectory.cc | 2 +-
- src/NCAskForFile.cc      | 2 +-
- src/NCFileSelection.h    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/NCAskForDirectory.cc b/src/NCAskForDirectory.cc
-index 06ec6ac..ed1a30c 100644
---- a/src/NCAskForDirectory.cc
-+++ b/src/NCAskForDirectory.cc
-@@ -39,7 +39,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <dirent.h>
--#include <sys/errno.h>
-+#include <errno.h>
- 
- /*
-   Textdomain "ncurses"
-diff --git a/src/NCAskForFile.cc b/src/NCAskForFile.cc
-index 31fdb39..63a6679 100644
---- a/src/NCAskForFile.cc
-+++ b/src/NCAskForFile.cc
-@@ -39,7 +39,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
--#include <sys/errno.h>
-+#include <errno.h>
- 
- /*
-   Textdomain "ncurses"
-diff --git a/src/NCFileSelection.h b/src/NCFileSelection.h
-index d42311f..514d020 100644
---- a/src/NCFileSelection.h
-+++ b/src/NCFileSelection.h
-@@ -38,7 +38,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
--#include <sys/errno.h>
-+#include <errno.h>
- 
- 
- struct NCFileInfo
--- 
-2.16.1
-

index 3388876e4..f60c85668 100644
@@ -5,13 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
 SRC_URI = "git://github.com/libyui/libyui-ncurses.git \
-           file://0001-src-Replace-using-sys-errno.h-with-errno.h.patch \
-           "
+          "
 
 SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
 
 PV = "2.48.3+git${SRCPV}"
-SRCREV = "7b251c2ff541df6139f3d210d0a0a27d042926bd"
+SRCREV = "79b804b45ffc6a0d92e28e793ff389a20b63b54b"
 
 S = "${WORKDIR}/git"
 

index 9b1d1d818..92d96044e 100644
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/libyui/libyui.git \
            "
 
 PV = "3.3.3+git"
-SRCREV = "f4ccea39f6b6f37eabd0a4df49db5f9bcb3c013a"
+SRCREV = "2b634cb7821e2e79dd4b7a73caf8e67c50189376"
 
 S = "${WORKDIR}/git"