Add patch to fix build with kernel 4.8+

This commit is contained in:
Andrey Bondrov 2017-02-12 14:16:57 +10:00
parent 5bde03c8d9
commit 2a2da3b8b7
2 changed files with 37 additions and 0 deletions

35
ppp-2.4.7-linux48.patch Normal file
View file

@ -0,0 +1,35 @@
From 33797aa193a2751da26f9af120e39c110defe4d1 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
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 <netinet/in.h>
+
#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 <linux/if_ether.h>
#endif
-#include <netinet/in.h>
-
#ifdef HAVE_NETINET_IF_ETHER_H
#include <sys/types.h>
--
2.9.3

View file

@ -38,6 +38,7 @@ Patch10: ppp-2.4.3-etcppp.patch
Patch11: ppp-2.4.5-includes-sha1.patch Patch11: ppp-2.4.5-includes-sha1.patch
Patch12: ppp-2.4.5-makeopt2.patch Patch12: ppp-2.4.5-makeopt2.patch
Patch13: ppp-2.4.7-nostrip.patch Patch13: ppp-2.4.7-nostrip.patch
Patch14: ppp-2.4.7-linux48.patch
BuildRequires: libtool BuildRequires: libtool
BuildRequires: atm-devel BuildRequires: atm-devel
BuildRequires: pcap-devel BuildRequires: pcap-devel
@ -203,6 +204,7 @@ popd
%patch11 -p1 -b .incsha1 %patch11 -p1 -b .incsha1
%patch12 -p1 -b .dhcp %patch12 -p1 -b .dhcp
%patch13 -p1 -b .nostrip %patch13 -p1 -b .nostrip
%patch14 -p1 -b .linux48
tar -xJf %{SOURCE112} tar -xJf %{SOURCE112}