From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 050E51395E2 for ; Fri, 11 Nov 2016 20:13:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F53DE0B71; Fri, 11 Nov 2016 20:13:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 247C6E0B71 for ; Fri, 11 Nov 2016 20:13:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7FD1341656 for ; Fri, 11 Nov 2016 20:13:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 383DE86E for ; Fri, 11 Nov 2016 20:13:01 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1478895151.a8f9980e70713039baa28f2ba7dd9c67b6cffda9.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild X-VCS-Directories: net-dialup/rp-pppoe/ net-dialup/rp-pppoe/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: a8f9980e70713039baa28f2ba7dd9c67b6cffda9 X-VCS-Branch: master Date: Fri, 11 Nov 2016 20:13:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 62335a67-8f92-43e0-88be-10d72285f71a X-Archives-Hash: 62a543af13a4fb9906979eace4fca506 commit: a8f9980e70713039baa28f2ba7dd9c67b6cffda9 Author: Mike Frysinger gentoo org> AuthorDate: Fri Nov 11 19:27:33 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Nov 11 20:12:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f9980e net-dialup/rp-pppoe: fix build w/linux-headers-4.8+ .../files/rp-pppoe-3.12-linux-headers.patch | 28 ++++++++++++++++++++++ net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild | 1 + 2 files changed, 29 insertions(+) diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch new file mode 100644 index 00000000..961eba3 --- /dev/null +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch @@ -0,0 +1,28 @@ +the linux headers have started adding shims to not define types or structs +when C lib headers are active, but in order to work, the C lib headers have +to be included before the linux headers. + +move the netinet/in.h include up above the linux/ includes. + +Mike Frysinger + +--- a/src/pppoe.h ++++ b/src/pppoe.h +@@ -47,6 +47,8 @@ + #include + #endif + ++#include ++ + /* Ugly header files on some Linux boxes... */ + #if defined(HAVE_LINUX_IF_H) + #include +@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; + #include + #endif + +-#include +- + #ifdef HAVE_NETINET_IF_ETHER_H + #include + diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild index addecd9..4739e1f 100644 --- a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild +++ b/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild @@ -48,6 +48,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch" epatch "${FILESDIR}/${PN}-3.11-gentoo.patch" epatch "${FILESDIR}/${PN}-3.11-kmode.patch" #364941 + epatch "${FILESDIR}/${PN}-3.12-linux-headers.patch" epatch_user