From 2a2da3b8b776e12f91dd26e96c383e16af030c7e Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sun, 12 Feb 2017 14:16:57 +1000 Subject: [PATCH] Add patch to fix build with kernel 4.8+ --- ppp-2.4.7-linux48.patch | 35 +++++++++++++++++++++++++++++++++++ ppp.spec | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 ppp-2.4.7-linux48.patch diff --git a/ppp-2.4.7-linux48.patch b/ppp-2.4.7-linux48.patch new file mode 100644 index 0000000..9b0920d --- /dev/null +++ b/ppp-2.4.7-linux48.patch @@ -0,0 +1,35 @@ +From 33797aa193a2751da26f9af120e39c110defe4d1 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Sat, 10 Dec 2016 19:53:56 +0100 +Subject: [PATCH] pppoe: include netinet/in.h before linux/in.h + +To fix build breakage. +--- + pppd/plugins/rp-pppoe/pppoe.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +index 9ab2eee..f77f5b7 100644 +--- a/pppd/plugins/rp-pppoe/pppoe.h ++++ b/pppd/plugins/rp-pppoe/pppoe.h +@@ -15,6 +15,8 @@ + + #include "config.h" + ++#include ++ + #if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H) + #define _POSIX_SOURCE 1 /* For sigaction defines */ + #endif +@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; + #include + #endif + +-#include +- + #ifdef HAVE_NETINET_IF_ETHER_H + #include + +-- +2.9.3 + diff --git a/ppp.spec b/ppp.spec index b3d1eb9..388bf92 100644 --- a/ppp.spec +++ b/ppp.spec @@ -38,6 +38,7 @@ Patch10: ppp-2.4.3-etcppp.patch Patch11: ppp-2.4.5-includes-sha1.patch Patch12: ppp-2.4.5-makeopt2.patch Patch13: ppp-2.4.7-nostrip.patch +Patch14: ppp-2.4.7-linux48.patch BuildRequires: libtool BuildRequires: atm-devel BuildRequires: pcap-devel @@ -203,6 +204,7 @@ popd %patch11 -p1 -b .incsha1 %patch12 -p1 -b .dhcp %patch13 -p1 -b .nostrip +%patch14 -p1 -b .linux48 tar -xJf %{SOURCE112}