summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2013-02-20 19:14:41 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2013-02-20 19:14:41 +0000
commita883d7e586ec8e20b5e5f2fabf230017232d30fb (patch)
tree1ed853a3a9f61e26b6e18879ccacba88eb5517ef /net-misc/miredo
parentpngquant license to MISC-FREE group (diff)
downloadgentoo-2-a883d7e586ec8e20b5e5f2fabf230017232d30fb.tar.gz
gentoo-2-a883d7e586ec8e20b5e5f2fabf230017232d30fb.tar.bz2
gentoo-2-a883d7e586ec8e20b5e5f2fabf230017232d30fb.zip
Fix bug #443448 by checking both /sbin and /bin for the ip command; simplify init scripts, avoiding the too-quiet mode and allowing monitoring.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key D4301342)
Diffstat (limited to 'net-misc/miredo')
-rw-r--r--net-misc/miredo/ChangeLog13
-rw-r--r--net-misc/miredo/files/miredo-1.2.5-ip-path.patch28
-rw-r--r--net-misc/miredo/files/miredo.conf.22
-rw-r--r--net-misc/miredo/files/miredo.rc.214
-rw-r--r--net-misc/miredo/metadata.xml3
-rw-r--r--net-misc/miredo/miredo-1.2.5-r2.ebuild (renamed from net-misc/miredo/miredo-1.2.5-r1.ebuild)15
6 files changed, 65 insertions, 10 deletions
diff --git a/net-misc/miredo/ChangeLog b/net-misc/miredo/ChangeLog
index 3f2f1d2cace7..fa694eb0c1d6 100644
--- a/net-misc/miredo/ChangeLog
+++ b/net-misc/miredo/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-misc/miredo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/ChangeLog,v 1.14 2012/06/20 06:22:44 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/ChangeLog,v 1.15 2013/02/20 19:14:41 flameeyes Exp $
+
+*miredo-1.2.5-r2 (20 Feb 2013)
+
+ 20 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+ +files/miredo-1.2.5-ip-path.patch, +files/miredo.conf.2, +files/miredo.rc.2,
+ +miredo-1.2.5-r2.ebuild, -miredo-1.2.5-r1.ebuild, metadata.xml:
+ Fix bug #443448 by checking both /sbin and /bin for the ip command; simplify
+ init scripts, avoiding the too-quiet mode and allowing monitoring.
*miredo-1.2.5-r1 (20 Jun 2012)
@@ -64,4 +72,3 @@
+files/miredo-server.rc, +metadata.xml:
initial import - in part based on the work Clemmit Sigler and Samuel
Tardieu (bug #77603)
-
diff --git a/net-misc/miredo/files/miredo-1.2.5-ip-path.patch b/net-misc/miredo/files/miredo-1.2.5-ip-path.patch
new file mode 100644
index 000000000000..1d7b0fc39f6e
--- /dev/null
+++ b/net-misc/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-misc/miredo/files/miredo.conf.2 b/net-misc/miredo/files/miredo.conf.2
new file mode 100644
index 000000000000..f4ef08a23112
--- /dev/null
+++ b/net-misc/miredo/files/miredo.conf.2
@@ -0,0 +1,2 @@
+# Options to pass to the daemon
+EXTRA_OPTS=""
diff --git a/net-misc/miredo/files/miredo.rc.2 b/net-misc/miredo/files/miredo.rc.2
new file mode 100644
index 000000000000..4ad4871ea76a
--- /dev/null
+++ b/net-misc/miredo/files/miredo.rc.2
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/files/miredo.rc.2,v 1.1 2013/02/20 19:14:41 flameeyes Exp $
+
+depend() {
+ need localmount
+ after net modules
+ use dns logger
+}
+
+command=/usr/sbin/${SVCNAME}
+command_args="${MIREDO_OPTS}"
+pidfile=/var/run/${SVCNAME}.pid
diff --git a/net-misc/miredo/metadata.xml b/net-misc/miredo/metadata.xml
index db913cec8c4a..91437cda0cd8 100644
--- a/net-misc/miredo/metadata.xml
+++ b/net-misc/miredo/metadata.xml
@@ -2,6 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
+ <email>flameeyes@gentoo.org</email>
+</maintainer>
+<maintainer>
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/net-misc/miredo/miredo-1.2.5-r1.ebuild b/net-misc/miredo/miredo-1.2.5-r2.ebuild
index 24b21e53869b..4e6a214608b9 100644
--- a/net-misc/miredo/miredo-1.2.5-r1.ebuild
+++ b/net-misc/miredo/miredo-1.2.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/miredo-1.2.5-r1.ebuild,v 1.1 2012/06/20 06:22:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miredo/miredo-1.2.5-r2.ebuild,v 1.1 2013/02/20 19:14:40 flameeyes Exp $
EAPI=4
@@ -30,6 +30,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO THANKS )
src_prepare() {
epatch "${FILESDIR}"/${P}-configure-libcap.diff
+ epatch "${FILESDIR}"/${P}-ip-path.patch
eautoreconf
}
@@ -38,17 +39,17 @@ src_configure() {
--disable-static \
--enable-miredo-user \
--localstatedir=/var \
- $(use_with caps libcap "${ROOT}usr")
+ $(use_with caps libcap)
}
src_install() {
default
prune_libtool_files
- newinitd "${FILESDIR}"/miredo-server.rc miredo-server
- newconfd "${FILESDIR}"/miredo-server.conf miredo-server
- newinitd "${FILESDIR}"/miredo.rc miredo
- newconfd "${FILESDIR}"/miredo.conf miredo
+ newinitd "${FILESDIR}"/miredo.rc.2 miredo
+ newconfd "${FILESDIR}"/miredo.conf.2 miredo
+ newinitd "${FILESDIR}"/miredo.rc.2 miredo-server
+ newconfd "${FILESDIR}"/miredo.conf.2 miredo-server
insinto /etc/miredo
doins misc/miredo-server.conf