From: Eneas U de Queiroz <redacted>
Date: Thu, 14 Jun 2018 15:00:55 +0000 (-0300)
Subject: rp-pppoe: redo glibc patch
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e40d67a48f6dc82c5e52f07859251460d6064a09;p=openwrt-packages.git

rp-pppoe: redo glibc patch

Previous fix broke compilation with kernel < 4.8

Signed-off-by: Eneas U de Queiroz <redacted>
---

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 3d6726b40..8b11cea54 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rp-pppoe
 PKG_VERSION:=3.12
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 PKG_MAINTAINER:=Daniel Dickinson <lede@cshore.thecshore.com>
 PKG_LICENSE:=LGPL-2.0+
 
diff --git a/net/rp-pppoe/patches/140-glibc-avoid-include-linux_in.h.patch b/net/rp-pppoe/patches/140-glibc-avoid-include-linux_in.h.patch
index 0a766f97e..de3244fdd 100644
--- a/net/rp-pppoe/patches/140-glibc-avoid-include-linux_in.h.patch
+++ b/net/rp-pppoe/patches/140-glibc-avoid-include-linux_in.h.patch
@@ -1,12 +1,12 @@
 --- a/src/pppoe.h
 +++ b/src/pppoe.h
-@@ -131,7 +131,9 @@ typedef unsigned long UINT32_t;
- #include <linux/if_ether.h>
+@@ -132,6 +132,9 @@ typedef unsigned long UINT32_t;
  #endif
  
-+#ifndef __GLIBC__
  #include <netinet/in.h>
-+#endif
++/* avoid redefinitions if <linux/in.h> and <linux/in6.h> get included. */
++#define _LINUX_IN_H
++#define _LINUX_IN6_H
  
  #ifdef HAVE_NETINET_IF_ETHER_H
  #include <sys/types.h>