From 22b11f445db978cdeae0873b7e887c0c89f523bf Mon Sep 17 00:00:00 2001
From: Lucas Ramage <ramage.lucas@protonmail.com>
Date: Sun, 18 Nov 2018 19:12:06 +0000
Subject: [PATCH] net-misc/zerotier: fix iproute2 path

Reported-By: Remy Blank <remy@c-space.org>
Closes: https://bugs.gentoo.org/671298
Signed-off-by: Lucas Ramage <ramage.lucas@protonmail.com>
---
 .../files/zerotier-1.2.12-fix-iproute2-path.patch  | 13 ++++++
 net-misc/zerotier/zerotier-1.2.12-r1.ebuild        | 46 ++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 net-misc/zerotier/files/zerotier-1.2.12-fix-iproute2-path.patch
 create mode 100644 net-misc/zerotier/zerotier-1.2.12-r1.ebuild

diff --git a/net-misc/zerotier/files/zerotier-1.2.12-fix-iproute2-path.patch b/net-misc/zerotier/files/zerotier-1.2.12-fix-iproute2-path.patch
new file mode 100644
index 00000000000..19d0789a9e6
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.2.12-fix-iproute2-path.patch
@@ -0,0 +1,13 @@
+diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp
+index 324fada0..77697784 100644
+--- a/osdep/ManagedRoute.cpp
++++ b/osdep/ManagedRoute.cpp
+@@ -62,7 +62,7 @@
+ #include "ManagedRoute.hpp"
+ 
+ #define ZT_BSD_ROUTE_CMD "/sbin/route"
+-#define ZT_LINUX_IP_COMMAND "/sbin/ip"
++#define ZT_LINUX_IP_COMMAND "/bin/ip"
+ #define ZT_LINUX_IP_COMMAND_2 "/usr/sbin/ip"
+ 
+ namespace ZeroTier {
diff --git a/net-misc/zerotier/zerotier-1.2.12-r1.ebuild b/net-misc/zerotier/zerotier-1.2.12-r1.ebuild
new file mode 100644
index 00000000000..f6da20e82ad
--- /dev/null
+++ b/net-misc/zerotier/zerotier-1.2.12-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic systemd toolchain-funcs
+
+HOMEPAGE="https://www.zerotier.com/"
+DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
+SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/ZeroTierOne-${PV}"
+
+RDEPEND="
+	dev-libs/json-glib:=
+	net-libs/http-parser:=
+	net-libs/libnatpmp:=
+	net-libs/miniupnpc:="
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md AUTHORS.md )
+
+PATCHES=( "${FILESDIR}/${P}-fix-iproute2-path.patch" )
+
+src_compile() {
+	append-ldflags -Wl,-z,noexecstack
+	emake CXX="$(tc-getCXX)" STRIP=: one
+}
+
+src_test() {
+	emake selftest
+	./zerotier-selftest || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}".init "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}".service
+	doman doc/zerotier-{cli.1,idtool.1,one.8}
+}
-- 
2.16.4