From d314a193412ad10497b40cc01efa00b41426c754 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 10 Dec 2016 20:08:15 +0100 Subject: [PATCH] Fix FTBFS --- ...clude-netinet-in.h-before-linux-in.h.patch | 35 +++++++++++++++++++ ppp.spec | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0029-pppoe-include-netinet-in.h-before-linux-in.h.patch diff --git a/0029-pppoe-include-netinet-in.h-before-linux-in.h.patch b/0029-pppoe-include-netinet-in.h-before-linux-in.h.patch new file mode 100644 index 0000000..9b0920d --- /dev/null +++ b/0029-pppoe-include-netinet-in.h-before-linux-in.h.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 6c85d01..6e95521 100644 --- a/ppp.spec +++ b/ppp.spec @@ -3,7 +3,7 @@ Summary: The Point-to-Point Protocol daemon Name: ppp Version: 2.4.7 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD and LGPLv2+ and GPLv2+ and Public Domain Group: System Environment/Daemons URL: http://www.samba.org/ppp @@ -50,6 +50,7 @@ Patch0025: 0025-pppd-install-pppd-binary-using-standard-perms-755.patch Patch0026: 0026-Revert-pppd-rebase-EAP-TLS-patch-v0.994.patch Patch0027: 0027-pppd-EAP-TLS-patch-v0.997.patch Patch0028: 0028-Fix-logical-expression-in-eap_client_active-macro.patch +Patch0029: 0029-pppoe-include-netinet-in.h-before-linux-in.h.patch BuildRequires: pam-devel, libpcap-devel, openssl-devel, systemd, systemd-devel, glib2-devel Requires: glibc >= 2.0.6, /etc/pam.d/system-auth, libpcap >= 14:0.8.3-6, systemd, initscripts >= 9.54 @@ -168,6 +169,9 @@ install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifdo %doc PLUGINS %changelog +* Sat Dec 10 2016 Lubomir Rintel - 2.4.7-10 +- Fix FTBFS + * Thu Feb 04 2016 Fedora Release Engineering - 2.4.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild