diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-02-11 16:19:15 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-02-11 19:33:35 +0100 |
| commit | dc4844b18b4761a375033c34c0ffd16bc8fafd9e (patch) | |
| tree | f39d85319b330a376c19abab2eedf5db48566939 /package/network/services/ppp/patches/140-pppoe_compile_fix.patch | |
| parent | e0e5f8ca2f6feaf9dc30d0c29619f2545800e790 (diff) | |
| download | upstream-dc4844b18b4761a375033c34c0ffd16bc8fafd9e.tar.gz upstream-dc4844b18b4761a375033c34c0ffd16bc8fafd9e.tar.bz2 upstream-dc4844b18b4761a375033c34c0ffd16bc8fafd9e.zip | |
pppd: fix compile issues with glibc 2.25
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/network/services/ppp/patches/140-pppoe_compile_fix.patch')
| -rw-r--r-- | package/network/services/ppp/patches/140-pppoe_compile_fix.patch | 62 |
1 files changed, 22 insertions, 40 deletions
diff --git a/package/network/services/ppp/patches/140-pppoe_compile_fix.patch b/package/network/services/ppp/patches/140-pppoe_compile_fix.patch index 2983a75c42..d9c9b83a33 100644 --- a/package/network/services/ppp/patches/140-pppoe_compile_fix.patch +++ b/package/network/services/ppp/patches/140-pppoe_compile_fix.patch @@ -1,23 +1,27 @@ ---- a/pppd/plugins/rp-pppoe/plugin.c -+++ b/pppd/plugins/rp-pppoe/plugin.c -@@ -46,10 +46,10 @@ static char const RCSID[] = - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> --#include <net/ethernet.h> - #include <net/if_arp.h> - #include <linux/ppp_defs.h> - #include <linux/if_pppox.h> -+#include <linux/if_ether.h> - - #ifndef _ROOT_PATH - #define _ROOT_PATH "" --- a/pppd/plugins/rp-pppoe/pppoe.h +++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -86,17 +86,6 @@ typedef unsigned long UINT32_t; +@@ -48,11 +48,7 @@ + #endif - #include <netinet/in.h> + /* Ugly header files on some Linux boxes... */ +-#if defined(HAVE_LINUX_IF_H) +-#include <linux/if.h> +-#elif defined(HAVE_NET_IF_H) + #include <net/if.h> +-#endif + #ifdef HAVE_NET_IF_TYPES_H + #include <net/if_types.h> +@@ -80,22 +76,8 @@ typedef unsigned long UINT32_t; + #error Could not find a 32-bit integer type + #endif + +-#ifdef HAVE_LINUX_IF_ETHER_H +-#include <linux/if_ether.h> +-#endif +- + #include <netinet/in.h> +- -#ifdef HAVE_NETINET_IF_ETHER_H -#include <sys/types.h> - @@ -28,21 +32,10 @@ -#include <netinet/if_ether.h> -#endif -#endif -- ++#include <net/ethernet.h> - /* Ethernet frame types according to RFC 2516 */ ---- a/pppd/plugins/rp-pppoe/if.c -+++ b/pppd/plugins/rp-pppoe/if.c -@@ -31,7 +31,7 @@ static char const RCSID[] = - #endif - - #ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> -+#include <linux/if_ether.h> - #endif - #ifdef HAVE_ASM_TYPES_H --- a/pppd/plugins/rp-pppoe/pppoe-discovery.c +++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c @@ -16,6 +16,7 @@ @@ -53,18 +46,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> -@@ -27,10 +28,6 @@ - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif -@@ -717,6 +714,23 @@ char *xstrdup(const char *s) +@@ -717,6 +718,23 @@ char *xstrdup(const char *s) return ret; } |