From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Date: Sun, 18 Mar 2018 23:02:50 -0700
Message-Id: <20180319060300.5366-8-raj.khem@gmail.com>
In-Reply-To: <20180319060300.5366-1-raj.khem@gmail.com>
References: <20180319060300.5366-1-raj.khem@gmail.com>
Subject: [meta-networking][PATCH 08/18] openl2tp: Fix build due to duplicate net/ headers
Precedence: list

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...api.c-include-rpc-clnt.h-for-resultproc_t.patch |  7 ++---
 ...0001-plugins-Remove-redundant-net-headers.patch | 31 ++++++++++++++++++++++
 .../openl2tp/0002-user-ipv6-structures.patch       |  7 ++---
 ...linux-kernel-headers-assumptions-on-glibc.patch |  9 ++++---
 .../recipes-protocols/openl2tp/openl2tp_1.8.bb     |  1 +
 5 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-plugins-Remove-redundant-net-headers.patch

diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch
index a11a97ebd..a72256f19 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch
@@ -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 <raj.khem@gmail.com>
 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 <raj.khem@gmail.com>
+
 ---
 Upstream-Status: Pending
 
@@ -27,5 +28,5 @@ index f0946fd..f77881c 100644
  //#include <netinet/in.h>
  
 -- 
-2.14.1
+2.16.2
 
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-plugins-Remove-redundant-net-headers.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-plugins-Remove-redundant-net-headers.patch
new file mode 100644
index 000000000..0276c6648
--- /dev/null
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-plugins-Remove-redundant-net-headers.patch
@@ -0,0 +1,31 @@
+From 343994e7f121bba7f16aa3b5e9c27b5aed7d1b99 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+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
+
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch
index 3f8bcaa48..abb09be8a 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch
@@ -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 <raj.khem@gmail.com>
 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 <raj.khem@gmail.com>
+
 ---
  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
 
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch
index 0fcba6546..ab5b22e01 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch
@@ -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 <raj.khem@gmail.com>
 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 <raj.khem@gmail.com>
+
 ---
  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
 
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
index bf6850b17..83e34b70a 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
@@ -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 = "\
-- 
2.16.2