1 |
commit: 3bb3c08af7428ac5e9d76bd0ed0481d03fdfaed8 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 24 09:48:36 2019 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 24 10:53:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb3c08a |
7 |
|
8 |
net-vpn/isatapd: Fix compilation with current kernels |
9 |
|
10 |
Closes: https://bugs.gentoo.org/599756 |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
13 |
|
14 |
net-vpn/isatapd/files/isatapd-linux-4.8.patch | 25 +++++++++++++++++++++++++ |
15 |
net-vpn/isatapd/isatapd-0.9.7-r2.ebuild | 11 ++++++++--- |
16 |
2 files changed, 33 insertions(+), 3 deletions(-) |
17 |
|
18 |
diff --git a/net-vpn/isatapd/files/isatapd-linux-4.8.patch b/net-vpn/isatapd/files/isatapd-linux-4.8.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..a95fe159d6d |
21 |
--- /dev/null |
22 |
+++ b/net-vpn/isatapd/files/isatapd-linux-4.8.patch |
23 |
@@ -0,0 +1,25 @@ |
24 |
+From: Bernhard Schmidt <berni@××××××.org> |
25 |
+Subject: Fix FTBFS with headers from Linux 4.8+ |
26 |
+Bug-Debian: https://bugs.debian.org/844869 |
27 |
+ |
28 |
+Linux 4.8+ adds a few includes to linux/if_tunnel.h, which conflict with |
29 |
+concurrent use of netinet/ip.h. Drop the latter and manually define IP_DF |
30 |
+which is not found anywhere else |
31 |
+--- a/src/tunnel.c |
32 |
++++ b/src/tunnel.c |
33 |
+@@ -18,10 +18,13 @@ |
34 |
+ #include <sys/ioctl.h> |
35 |
+ #include <sys/socket.h> |
36 |
+ #include <arpa/inet.h> |
37 |
+-#include <netinet/ip.h> |
38 |
+ #include <net/if.h> |
39 |
+ #include <linux/if_tunnel.h> |
40 |
+ |
41 |
++#ifndef IP_DF |
42 |
++ #define IP_DF 0x4000 /* dont fragment flag */ |
43 |
++#endif |
44 |
++ |
45 |
+ #ifdef HAVE_CONFIG_H |
46 |
+ #include <config.h> |
47 |
+ #endif |
48 |
+ |
49 |
|
50 |
diff --git a/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild b/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild |
51 |
index 9474bf9461e..210a012e953 100644 |
52 |
--- a/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild |
53 |
+++ b/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild |
54 |
@@ -1,10 +1,10 @@ |
55 |
-# Copyright 1999-2015 Gentoo Foundation |
56 |
+# Copyright 1999-2019 Gentoo Authors |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
|
59 |
-EAPI=5 |
60 |
+EAPI=7 |
61 |
inherit linux-info systemd |
62 |
|
63 |
-DESCRIPTION="creates and maintains an ISATAP tunnel (rfc5214)" |
64 |
+DESCRIPTION="Creates and maintains an ISATAP tunnel (rfc5214)" |
65 |
HOMEPAGE="http://www.saschahlusiak.de/linux/isatap.htm" |
66 |
SRC_URI="http://www.saschahlusiak.de/linux/${P}.tar.gz" |
67 |
|
68 |
@@ -19,9 +19,14 @@ RDEPEND="" |
69 |
CONFIG_CHECK="~TUN" |
70 |
ERROR_TUN="CONFIG_TUN is needed for isatapd to work" |
71 |
|
72 |
+PATCHES=( "${FILESDIR}"/${PN}-linux-4.8.patch ) |
73 |
+ |
74 |
src_prepare() { |
75 |
+ default |
76 |
sed -e '/^opts/s:opts:extra_started_commands:' \ |
77 |
-i openrc/isatapd.init.d || die |
78 |
+ sed -e 's:#!/sbin/runscript:#!/sbin/openrc-run:' \ |
79 |
+ -i openrc/isatapd.init.d || die |
80 |
} |
81 |
|
82 |
src_install() { |