Fix bug #443448 by checking both /sbin and /bin for the ip command; simplify init scripts, avoiding the too-quiet mode and allowing monitoring.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xD4301342

7 files changed, 86 insertions, 24 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/Manifest b/net-misc/miredo/Manifest
index fc38110e54b4..7746c9c5e811 100644
--- a/net-misc/miredo/Manifest
+++ b/net-misc/miredo/Manifest
@@ -1,20 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX miredo-1.2.5-configure-libcap.diff 918 RMD160 a632a8c81fd9775e2e5cd3eac41216e9b9ba5637 SHA1 28bcc62327ae46b035cff9dfa47d549b1e0d5e61 SHA256 0e78e9311d3e493b290e21550d1cf9d3227a591d79714b41797d1f8b8f936eca
-AUX miredo-server.conf 153 RMD160 932382395edc4fdfa4bb07b153cea074bfe8775a SHA1 4f0a0d4f201fbdcf1c85a369eb538047638cfe4f SHA256 6f00335aa1c763a5776ea160722a0e83f9bf8454a5672381e0234dfb80a2a91b
-AUX miredo-server.rc 677 RMD160 026f84a97ccf7a7a7c24dadf6ecfee650f29035c SHA1 57a4d1b06b0b651b703f024a4cd74b94703f7a85 SHA256 127fe97a18997e6811101673822657e342dad47888eaefdacd633b684454764e
-AUX miredo.conf 151 RMD160 abc0ef64c6683b7a51fb6d39119348f680034bbf SHA1 c5486c6572532f02240b9d18f09c3804f2dd05fd SHA256 662e7ac2262c9d2b89887a14a4366e1f938ca82a04a55d72340db5a1e91f3cce
-AUX miredo.rc 621 RMD160 e8303c768818c823c09abb1ad9efc0b70d324dd6 SHA1 4c22ee0632423014a5523c66174020e03050b749 SHA256 08f15f157365ec3ebb1ac364092aa66e76cdde23fcf34a3231efe822bbdd9a6c
-DIST miredo-1.2.5.tar.xz 474236 RMD160 19a2b6dd462eadb2a6de03c003eb5e7ad6193fc2 SHA1 3aa4f35e78ffaca2c8652f428401be6e384888c9 SHA256 9d6c6aacfbde0e152481273cda4dc9a62f8724c4c941fa8e0806e89ab9992262
-EBUILD miredo-1.2.5-r1.ebuild 1349 RMD160 7ed0b06e5b33195aad171c03e0266a19c105b6b5 SHA1 edeed87e5b76c945c5e25821101a8ede51971e45 SHA256 ce4f127f605a53103afbe135c80988530d4ab121cb48c3398200feb5f56d7289
-EBUILD miredo-1.2.5.ebuild 1424 RMD160 ada5c2f265d8e25fc35ae8629277bdc6958ccb31 SHA1 4e5ade5a909f8b71fd9924b8717fa50b29337911 SHA256 448880827d5741f93bd41611aba66f2b894b796efda64ddcf96efc3f2ad15475
-MISC ChangeLog 2429 RMD160 2c5c515a1dae23c7e9df4e6dd466efa392a4e6ee SHA1 58c7959e4ba1e8dd1153e58047a4d35756f448b5 SHA256 170c9000d271c4af4412a5c7ebf31f2f6e748be69d9fc4703fe6e94db06b72aa
-MISC metadata.xml 560 RMD160 7c57ac5edd3532db3e3fc09133995ea74bbd33e2 SHA1 744529789815d0361d7a3a4a0709dddf9bc86376 SHA256 f1112f93ea4867d6fc57b3503ad2989d695a860c5ba474f80bc2b30b1164d2e7
+AUX miredo-1.2.5-configure-libcap.diff 918 SHA256 0e78e9311d3e493b290e21550d1cf9d3227a591d79714b41797d1f8b8f936eca SHA512 151a5edc97c021b8d54dfb4664321c1774ce703bf9eaebb0079ba04100e5af1f632218172f674b781f8d1df64993761435c78a26cb0c4158929cdf9e0ba27523 WHIRLPOOL 92dcd4cf531a0c6db2029ddfcd12a194c9e6d7bcc0d61ac4303ae180c2651e2e5646d3489f7be79d9b9d462dec986e81f832e06e7a2ef747486089c774f575d4
+AUX miredo-1.2.5-ip-path.patch 802 SHA256 67a7cb33b45613b587d94e620e179b988525143164f3f131cdaed1296630189b SHA512 dba30cebdc245f623b75cfcf018508af31619eeb3f1830bb767cd4d6d5aeeb8988948f57d454cc96bcbaae793374e83645dbb4782c717b60ab3738cfd4e804ab WHIRLPOOL 32e983df3544539d7c0c0df0c903207afbeda6145d5ab2748460151afea22250c110941d05ef218340bda71f3cfa7ee6d59d3cbcea7fb7f033cf921a5e6d6a63
+AUX miredo-server.conf 153 SHA256 6f00335aa1c763a5776ea160722a0e83f9bf8454a5672381e0234dfb80a2a91b SHA512 6d094b34fca7f95dde72c3c0a588aa377b2fcefafd528457c96ad529b6ac805e6524956d47453d42f01c3cdfe111c1f56720dc30089796f4030830ee89b8ed4f WHIRLPOOL 9d260f8e958d51ee79303bbf7c37bd23bcd0c0a02aef960c2f65c2884e1d77c40f4b4d3e7ce3b95acc28375712cac36fc0fc9d1d00fe9f0efb7234d99c071671
+AUX miredo-server.rc 677 SHA256 127fe97a18997e6811101673822657e342dad47888eaefdacd633b684454764e SHA512 298e9f6febc29860eec2019a088090431d698f2ecde3172afb43d369c654083477f171face4ea8ee8be336c7636825284ca79c007228586de1e2217d8a27d31d WHIRLPOOL a465b4bf5ff3cef31929793a46deb3f20aeca362730e01cd91785a34aca5572341ac8ff00ac42cca0fb07aa028badb6ba7cb1dbf0dbd827320ec4389595a3e62
+AUX miredo.conf 151 SHA256 662e7ac2262c9d2b89887a14a4366e1f938ca82a04a55d72340db5a1e91f3cce SHA512 7aafbf28a67b98af4dea7f97b760fb230fc9ce97e5e4d839ec5ff909732be10039e873c1ce132e33e767c449233f1bebc49feb30533aa2ba25dfe7a5909d8d89 WHIRLPOOL 8582143c6cdf4a1870cca1e090884a0c8b51f486fe577e66526423fb18a9449b6df5e729ceb1abc4e3f2689c05dab6f626788f84b5e8e41fa7f9e728b49e5a2b
+AUX miredo.conf.2 46 SHA256 4ddee52d16bf7510b5eae619507a0d4a2039a5c91d55ca35f1aed54a977a6058 SHA512 a0257aee71f0aa476bc5876854e1a08387812ea7b5048a8f5d67d4202d27e8d76c0826720b8a84f4bbaed3ed209e94bf723123b8dcfc8a953fc6abdb831235c3 WHIRLPOOL 89c1083f127122f079a54d7a8d2a6da7d73ff9482f13ee082a1bdfde2f72b34fa6e3ab2c28e4f26b74587235c014badb7d7cbf4e14919c3d4c642abf17c20573
+AUX miredo.rc 621 SHA256 08f15f157365ec3ebb1ac364092aa66e76cdde23fcf34a3231efe822bbdd9a6c SHA512 53e983039780474987ba48428cc9be7fa8fc6e965a4023dc3418ce027c6e1569962d8e40d17b32250c8203bcf1566560174c5d70775f1d6882b3902ae1837ea7 WHIRLPOOL ef7ddef65ee1872a021791cc6469a212f52bca63773a2a8411deaeda356b769b3a20ad9ba24ab050485c872d76021555b5fe075d1897d2fc3ea391686ffe3207
+AUX miredo.rc.2 394 SHA256 c7863e6b9c3e5b64d15b6d0a09f073419e0a4083b678b6718c4c0e23f4ef6d11 SHA512 d4c387ebd97d644514e46ab7e86f163277ab0d7ce389b9b0c5c856c2864be7d338aa548610012432dac99bbd7e77c6007bd60af168a645410b1d0f3be4d64a23 WHIRLPOOL 63238914091fdf1219c6f750cbeb5f18d804884e44e33f2fec0da629112ef9f3b9fdd5c95cdbce2c757716db6e60d16941e5e59540559880e0f6fdac0ba7011d
+DIST miredo-1.2.5.tar.xz 474236 SHA256 9d6c6aacfbde0e152481273cda4dc9a62f8724c4c941fa8e0806e89ab9992262 SHA512 94bc71b7093783ad103a0aceb95ad3de1739e4ec1d763b3c6cea9bb1768f55359448957f623ee3f966955c555bb9f71ff0216d9d4e8d2ff244bb058731702c70 WHIRLPOOL 45b38f19fc50bb5661dcc51166c721c507d70b29072c7a2c3195c093ec91259dfbcdc40e3889f5242af79cf2f04fb7fdb3e48f7bd2cc15d6262813891fa9624c
+EBUILD miredo-1.2.5-r2.ebuild 1377 SHA256 ee48b0ffce107fa178d5d4e6580fe98e25256e33bd9de4d02d613660860ec1ff SHA512 5c2a31fa59a7a89cbedde0b7f23d492ced2c27323536a4b70fb42b65ada2ad18e3a24e4a1e75c650937febae4d811c36f6cb10e3f0149364200890e3eb5d1193 WHIRLPOOL 0016bcdeeefe58e073048b1eca26e22799dadf4da1b3de2b5d685e0774a065a4ef4c14cb0928fc87083c5d32d16bbdb2d24515d75bd20552de9b201751367889
+EBUILD miredo-1.2.5.ebuild 1424 SHA256 448880827d5741f93bd41611aba66f2b894b796efda64ddcf96efc3f2ad15475 SHA512 28cf15addf42a99dd588b7ea1fa8b72abd6ad80d7fca8194b0031902c9f73046ed9dcd01f8df70426c4885e1157bc5fa2fe9d78a2e9b37faacf7dd8d71567fdf WHIRLPOOL f59bff87a6c3953f123924a54e93d30e763171be7cd18521077a3c1c436148f6f295244fc926402ac6ed9d98d6313d943a2285bb0fc9e7f8fe2fbdcd4e4d9f05
+MISC ChangeLog 2816 SHA256 ac419c507f926c28740be4290429957cafdfc5de1bdc780209ce954eea780412 SHA512 b43c9b84ae8c44ba78894e2ff63bb36db92a0cd050b35cb5811da9b7bb471601cdb7ac6093963441340ba71e91a24af6ebe289a3c4c6c84323f690dfe226b942 WHIRLPOOL a132b923c6c2675b82d73a3a01eeb02c1094f61fdf3e5791d68c851fe901bdd87cc2aa32697ed5e6f8a0e50854d808cf30734a0e4dc27fb1a7bceecec7faa6b0
+MISC metadata.xml 625 SHA256 5fcdaed41a3e9520e1dc32238784a48afa87d0352cb6c236775a1b51f77d5286 SHA512 5333a67fcc97d78b0497c0074be2f3ed0f4636307bd76a09a92bd012a632998286a4bfcf67ee1627cacef2baaadf8204480ae3a7001719a44206247fcc40255e WHIRLPOOL 499a94b6bca12b7c70036d999a5be812571270e24c3903c7270352a327f8765d63fb21c24e5fbc1adc4847682f58007bf3ca984f185508521b98b7efc82dfde4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/hbBAACgkQknrdDGLu8JDDJgD/Yr9W9RvKiln5Hozmt7VTq1L1
-3kBLKuhER/wgPJ2W5ikA/32AEJQxMaYY6wAEOGeLCflRUDQXZ6lmZfarGgW8IBcn
-=/9mI
+iQEcBAEBCAAGBQJRJSCbAAoJEBzRPIrUMBNCJecH/2/Fvn6ZOVHk307rwFXM71oS
+0vg4p6e386s55+mYd+q8sYxZPOU5yIvjReGqUYcVgtBELlO+biJ94nlyWGO7/wz3
+afStYuxnrEAd+cgSATjGCgbvbMOY63gzDqWZeYu8pONP9Odn2WNzMBZSP+ONSCbQ
+be/XU5KLazkCVzCtmKTPd1SXSoG3Fcp7SseMi9DSwMW6SLZb3mxu1ucStqxFF8Sc
+XYLZ+XROs+vTc8TVy4eeOiqRqbG09MX9pnEy8aBS5VK/auNBaRq+TGzkDMkhzdug
+mZzVsSiaHhIB/pa6kEYnL21GayMRMURk5qZP8P4fYsY1omtWu00/7U/AW17Tv1I=
+=Apcc
 -----END PGP SIGNATURE-----
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