commit 61c55da42814df609d044d0d512f0885955fcf22 Author: Juergen Daubert <jue@jue.li> Date: Sat Jan 21 19:22:33 2017 +0100 ppp: fix build with 4.9 kernel-headers, patch from fedora diff --git a/ppp/.md5sum b/ppp/.md5sum index c12f7ce..fe1ac59 100644 --- a/ppp/.md5sum +++ b/ppp/.md5sum @@ -1,2 +1,3 @@ +215ae2d9bfbaaf2a47d621d1a7727c7c 0029-pppoe-include-netinet-in.h-before-linux-in.h.patch 78818f40e6d33a1d1de68a1551f6595a ppp-2.4.7.tar.gz 24867da3561a2ba62f555ac717af77cb ppp-nofilter.patch diff --git a/ppp/.signature b/ppp/.signature index a76f8eb..f35f31f 100644 --- a/ppp/.signature +++ b/ppp/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XOyxCw8Vin/obZY72pmMrUTv2figVX1QK+7sw7alR5MEzDhFo2zaC+txshkIAvx1WawrZuFBJT/OQt4vQ6CXQE= -SHA256 (Pkgfile) = 340ec15e58183d2b061084ee85ecd1cfe80c3c753d7b02d25f23f68ce9cc4493 +RWSE3ohX2g5d/d3qyaOEH6ldsWvr8lmNrz/GZgdowz+3GBE7A9NzGVw7sPszri6ebiJKBJ+ZkJjDwkaZdpUKT8jN1tv0+Kfu6gE= +SHA256 (Pkgfile) = 227cb03345485e58a78c530f7930f80c6dbc5529b51a20687ee32d02e659e165 SHA256 (.footprint) = 02ba8f49c773c5bb70a42ff518804a8343a501ca650fa08a9465a736cece84f2 SHA256 (ppp-2.4.7.tar.gz) = 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 SHA256 (ppp-nofilter.patch) = ac6100526d256e341183aa6470515f85cfb6195277b801339c4f7930942132fa +SHA256 (0029-pppoe-include-netinet-in.h-before-linux-in.h.patch) = 7239409d9e28d2874da41db189e6c45a0c8f3894879783966ddcea0b5462779a diff --git a/ppp/0029-pppoe-include-netinet-in.h-before-linux-in.h.patch b/ppp/0029-pppoe-include-netinet-in.h-before-linux-in.h.patch new file mode 100644 index 0000000..9b0920d --- /dev/null +++ b/ppp/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 <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 + diff --git a/ppp/Pkgfile b/ppp/Pkgfile index 65249a9..9fa1f8a 100644 --- a/ppp/Pkgfile +++ b/ppp/Pkgfile @@ -5,13 +5,19 @@ name=ppp version=2.4.7 -release=2 +release=3 source=(http://ppp.samba.org/ftp/ppp/$name-$version.tar.gz \ - $name-nofilter.patch) + $name-nofilter.patch \ + 0029-pppoe-include-netinet-in.h-before-linux-in.h.patch) build () { cd $name-$version + patch -p1 -i $SRC/$name-nofilter.patch + + # http://pkgs.fedoraproject.org/cgit/rpms/ppp.git/tree/ + patch -p1 -i $SRC/0029-pppoe-include-netinet-in.h-before-linux-in.h.patch + ./configure --prefix=/usr --sysconfdir=/etc make make -j1 INSTROOT=$PKG install install-etcppp