diff options
author | Jason A. Donenfeld <zx2c4@gentoo.org> | 2017-03-17 15:37:57 +0100 |
---|---|---|
committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2017-03-17 15:38:28 +0100 |
commit | 9754f457cc6d0aeb90a1535a5228ef909e9584c9 (patch) | |
tree | ffbd77f41fb100837cc8f992f8dc863cd01c270d /net-vpn/miredo/files | |
parent | app-forensics/openscap: remove old (diff) | |
download | gentoo-9754f457cc6d0aeb90a1535a5228ef909e9584c9.tar.gz gentoo-9754f457cc6d0aeb90a1535a5228ef909e9584c9.tar.bz2 gentoo-9754f457cc6d0aeb90a1535a5228ef909e9584c9.zip |
Second half of net-vpn/ move
Diffstat (limited to 'net-vpn/miredo/files')
-rw-r--r-- | net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff | 33 | ||||
-rw-r--r-- | net-vpn/miredo/files/miredo-1.2.5-ip-path.patch | 28 | ||||
-rw-r--r-- | net-vpn/miredo/files/miredo.conf.2 | 2 | ||||
-rw-r--r-- | net-vpn/miredo/files/miredo.rc.2 | 13 |
4 files changed, 76 insertions, 0 deletions
diff --git a/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff b/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff new file mode 100644 index 000000000000..cffdbf1e562e --- /dev/null +++ b/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff @@ -0,0 +1,33 @@ +--- configure.ac.ori 2012-06-14 21:55:13.756603416 +0200 ++++ configure.ac 2012-06-14 23:12:01.425399836 +0200 +@@ -150,16 +150,23 @@ + + # POSIX capabilities + LIBCAP="" +-AC_CHECK_HEADERS([sys/capability.h], [ +- AC_CHECK_LIB(cap, cap_set_proc, [ +- LIBCAP="-lcap" +- AC_DEFINE(HAVE_LIBCAP, 1, +- [Define to 1 if you have the `cap' library (-lcap).]) +- ]) ++AC_ARG_WITH(libcap, ++ AS_HELP_STRING([--with-libcap], [enable POSIX 1003.1e capabilities]), ++ with_libcap=$withval, ++ with_libcap=auto) ++AC_MSG_CHECKING([whether to enable POSIX 1003.1e capabilities]) ++AC_MSG_RESULT($with_libcap) ++ ++AS_IF([test "x$with_libcap" != "xno"], [ ++ AC_CHECK_HEADERS([sys/capability.h]) ++ AC_CHECK_LIB(cap, cap_set_proc, [ ++ LIBCAP="-lcap" ++ AC_DEFINE(HAVE_LIBCAP, 1, ++ [Define to 1 if you have the cap library (-lcap).]) ++ ]) + ]) + AC_SUBST(LIBCAP) + +- + # Judy + AC_ARG_WITH(Judy, + [AS_HELP_STRING(--with-Judy, diff --git a/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch b/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch new file mode 100644 index 000000000000..1d7b0fc39f6e --- /dev/null +++ b/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch @@ -0,0 +1,28 @@ +Index: miredo-1.2.5/misc/client-hook.iproute +=================================================================== +--- miredo-1.2.5.orig/misc/client-hook.iproute ++++ miredo-1.2.5/misc/client-hook.iproute +@@ -5,7 +5,10 @@ + # Distributed under the terms of the GNU General Public License version 2. + + # Linux iproute2 path: +-IP="/sbin/ip" ++IP="ip" ++ ++test -x "/sbin/ip" && IP=/sbin/ip ++test -x "/bin/ip" && IP=/bin/ip + + # Linux default route default metric is 1024 + # (we put 1029 so that Teredo is used as a last resort): +@@ -23,11 +26,6 @@ PRIO=32765 + # (default: specified by the Teredo server, or 1280) + #MTU=1400 + +-if ! test -x "$IP"; then +- echo "$0: iproute2 is required! Please install it." >&2 +- exit 1 +-fi +- + # Nothing to do with destroy event + if test "$STATE" = "destroy"; then exit 0; fi + diff --git a/net-vpn/miredo/files/miredo.conf.2 b/net-vpn/miredo/files/miredo.conf.2 new file mode 100644 index 000000000000..f4ef08a23112 --- /dev/null +++ b/net-vpn/miredo/files/miredo.conf.2 @@ -0,0 +1,2 @@ +# Options to pass to the daemon +EXTRA_OPTS="" diff --git a/net-vpn/miredo/files/miredo.rc.2 b/net-vpn/miredo/files/miredo.rc.2 new file mode 100644 index 000000000000..c0ae6d0d1495 --- /dev/null +++ b/net-vpn/miredo/files/miredo.rc.2 @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need localmount + after net modules + use dns logger +} + +command=/usr/sbin/${SVCNAME} +command_args="${MIREDO_OPTS}" +pidfile=/var/run/${SVCNAME}.pid |