commit: e90fedffa23e37c8a97ac56e6a52cd16c42c63c8 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Thu Dec 20 18:41:23 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Dec 20 18:41:23 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e90fedff
sys-apps/net-tools: fix the header patch Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../net-tools/files/net-tools-fix-headers-r1.patch | 19 +++++++++++++++++++ .../net-tools/net-tools-1.60_p20180626073013.ebuild | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/sys-apps/net-tools/files/net-tools-fix-headers-r1.patch b/sys-apps/net-tools/files/net-tools-fix-headers-r1.patch new file mode 100644 index 0000000..f4ce1f6 --- /dev/null +++ b/sys-apps/net-tools/files/net-tools-fix-headers-r1.patch @@ -0,0 +1,19 @@ +diff -Naur net-tools-1.60_p20180626073013.orig/iptunnel.c net-tools-1.60_p20180626073013/iptunnel.c +--- net-tools-1.60_p20180626073013.orig/iptunnel.c 2018-06-26 07:30:13.000000000 -0000 ++++ net-tools-1.60_p20180626073013/iptunnel.c 2018-12-20 18:32:45.607928052 -0000 +@@ -25,14 +25,12 @@ + #include <fcntl.h> + #include <sys/socket.h> + #include <sys/ioctl.h> +-#include <netinet/in.h> +-#include <arpa/inet.h> +-#include <net/if.h> + #include <net/if_arp.h> + /* We only care about linux/if_tunnel.h. Unfortunately, older Linux headers + * (pre linux-4.8) did not include all the proper headers leading to missing + * structs and types. + */ ++#include <linux/in.h> + #include <linux/types.h> + #include <linux/ip.h> + #include <linux/if_tunnel.h> diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild index 117b7b2..88255ba 100644 --- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild +++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild @@ -33,7 +33,7 @@ RDEPEND+=" !<sys-apps/openrc-0.9.9.3" PATCHES=( - "${FILESDIR}/${PN}-fix-headers.patch" + "${FILESDIR}/${PN}-fix-headers-r1.patch" ) maint_pkg_create() {