diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
| commit | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch) | |
| tree | 3cb05783d73b2c33589ba305144a31c718e123cd /net-vpn/isatapd | |
| parent | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff) | |
gentoo resync : 03.03.2019
Diffstat (limited to 'net-vpn/isatapd')
| -rw-r--r-- | net-vpn/isatapd/Manifest | 3 | ||||
| -rw-r--r-- | net-vpn/isatapd/files/isatapd-linux-4.8.patch | 25 | ||||
| -rw-r--r-- | net-vpn/isatapd/isatapd-0.9.7-r2.ebuild | 11 |
3 files changed, 35 insertions, 4 deletions
diff --git a/net-vpn/isatapd/Manifest b/net-vpn/isatapd/Manifest index dc0c063cd60c..f60b598dace2 100644 --- a/net-vpn/isatapd/Manifest +++ b/net-vpn/isatapd/Manifest @@ -1,5 +1,6 @@ +AUX isatapd-linux-4.8.patch 650 BLAKE2B b45ccb0903be122c3561e3096933ec66642ff882848bbd4996dfb03292c1d8c435ad366b077382d4fc002a0f28ec3931a5c3b927cfdbf158c266224c9dab5cdc SHA512 6b4595b6e23d6dc318bc696e8bc271a22d5e0721a172ff1a6926f6f04338997c9b7d9e7abe0747581f259ec8616a1f39c0c98de9535cbdb2d9fb4514ac9da259 AUX isatapd.service-r2 336 BLAKE2B 23cdfcc30f60a7276408c7f1545b8b1daff592a2bd122c395f6d46281810833db3005c42902b0096ac9788cbb9111342dd42d06fccfe26e3f7e9a6415ea83c09 SHA512 e7e002163ca6c780ec7f3df5cb60923ecb2631628d9ec65c97a60e0071145ce46c4bbef282ebdb322a82bc81cda15b7e256ae9122993df8b1f625c3fcd26c5f9 AUX isatapd.service.conf 1026 BLAKE2B 345d8ba815b5007dd0901a9b8578f1bedac4005dac42c855a8dd14266624e297c61afc673f6c00c067df3ebe2f5ec7ea417e2019de3507b3a98a880d6f3fdab5 SHA512 d87ace4cb331d561e817c9dd7fce1ab4b9df60016bba40bfc53728f6c8ee418b17ae71753f6caa0e1647f569037b59d93a3a9778c4f7dcdf543eee702be95c76 DIST isatapd-0.9.7.tar.gz 111524 BLAKE2B eba3a7489c673a0bc44061bb8151f10b3a62b3842c942511f7566212c340188a5fea15a3ac21cfde9009129d63639acfcb08568b5b18a31bacc15905384cf5c1 SHA512 3ddfc8385b666ec8c0552c7b46841f2b5e8ebb5d9aa3119a9a6d4cacea728cb81dced802d51b7c98da4bbb839de6fe68ef1bc5f62914b48638b6f168fc06100a -EBUILD isatapd-0.9.7-r2.ebuild 802 BLAKE2B 394b7d85539fa2596eea68c31e789b276b59d50d962c3906717e5fd125b5987e4fcc48e39e3a65cb252461bbc6f2baeaa50ca6765e5f2caab8066e0757785ca0 SHA512 5b10c17c03d278d9c4b7eb5b043d8d5e7c8cce84757643be967902766a2f8908ad13c66abd55c944659eeee3358e7ca8c7cf500f86e5320db6d5bd93eb2f8cdc +EBUILD isatapd-0.9.7-r2.ebuild 943 BLAKE2B 39d8149bf16955c80a0f1aca239df2e93b3ff66a495129e195ad39de89a75b93fd33b5f7b72ff921db28007e7877cc8bc3598894eb90467571af255856fb27c9 SHA512 ef6b10ece3f218e8c2a7a36e5d19049d38ae97178c5fc1554b6e19cf8652d4dae5fc2a3767c62e383beef5c6d7f862d75d4b8217c0d876d8804913e9a6683450 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-vpn/isatapd/files/isatapd-linux-4.8.patch b/net-vpn/isatapd/files/isatapd-linux-4.8.patch new file mode 100644 index 000000000000..a95fe159d6d9 --- /dev/null +++ b/net-vpn/isatapd/files/isatapd-linux-4.8.patch @@ -0,0 +1,25 @@ +From: Bernhard Schmidt <berni@debian.org> +Subject: Fix FTBFS with headers from Linux 4.8+ +Bug-Debian: https://bugs.debian.org/844869 + +Linux 4.8+ adds a few includes to linux/if_tunnel.h, which conflict with +concurrent use of netinet/ip.h. Drop the latter and manually define IP_DF +which is not found anywhere else +--- a/src/tunnel.c ++++ b/src/tunnel.c +@@ -18,10 +18,13 @@ + #include <sys/ioctl.h> + #include <sys/socket.h> + #include <arpa/inet.h> +-#include <netinet/ip.h> + #include <net/if.h> + #include <linux/if_tunnel.h> + ++#ifndef IP_DF ++ #define IP_DF 0x4000 /* dont fragment flag */ ++#endif ++ + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif + diff --git a/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild b/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild index 9474bf9461e8..210a012e9532 100644 --- a/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild +++ b/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit linux-info systemd -DESCRIPTION="creates and maintains an ISATAP tunnel (rfc5214)" +DESCRIPTION="Creates and maintains an ISATAP tunnel (rfc5214)" HOMEPAGE="http://www.saschahlusiak.de/linux/isatap.htm" SRC_URI="http://www.saschahlusiak.de/linux/${P}.tar.gz" @@ -19,9 +19,14 @@ RDEPEND="" CONFIG_CHECK="~TUN" ERROR_TUN="CONFIG_TUN is needed for isatapd to work" +PATCHES=( "${FILESDIR}"/${PN}-linux-4.8.patch ) + src_prepare() { + default sed -e '/^opts/s:opts:extra_started_commands:' \ -i openrc/isatapd.init.d || die + sed -e 's:#!/sbin/runscript:#!/sbin/openrc-run:' \ + -i openrc/isatapd.init.d || die } src_install() { |