The init script fails on a machine with multiple non-lo interfaces as route only takes one argument, I discovered this during testing fast booting, when there was no default route yet. I think it should not bother to check for a route anyway (as it is moot after there is a default route), but I'm not making that change.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 13 insertions, 26 deletions

diff --git a/net-libs/openslp/ChangeLog b/net-libs/openslp/ChangeLog
index dfc6649d0ad2..7763425282fb 100644
--- a/net-libs/openslp/ChangeLog
+++ b/net-libs/openslp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/openslp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.49 2012/01/24 22:52:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.50 2012/02/09 08:19:35 robbat2 Exp $
+
+  09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> files/slpd-init:
+  The init script fails on a machine with multiple non-lo interfaces as route
+  only takes one argument, I discovered this during testing fast booting, when
+  there was no default route yet. I think it should not bother to check for a
+  route anyway (as it is moot after there is a default route), but I'm not
+  making that change.
 
   24 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   openslp-1.2.1-r2.ebuild, +files/openslp-1.2.1-cflags.patch:
diff --git a/net-libs/openslp/Manifest b/net-libs/openslp/Manifest
index f9121fe2eda3..9ba5fbabbbc8 100644
--- a/net-libs/openslp/Manifest
+++ b/net-libs/openslp/Manifest
@@ -1,32 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX openslp-1.2.1-cflags.patch 400 RMD160 8cdd527f3cdd580fd862481be465381b5283c30f SHA1 b0f28fdf483222f29e4c74495514f6050f8f760b SHA256 0b7ecc480aae4a47761d6328f61135eef371e4098318de8278899f7e1f8ec766
 AUX openslp-1.2.1-fbsd.patch 346 RMD160 e44601bd0529ed38b2d51faaa37628ebc4600927 SHA1 1f2b53e69befb910fad574a873d6845eecc5822e SHA256 131caf1dafc81f519d2e50bead9a2658e4efcb3594777ab189fd60a23f097da9
 AUX openslp-1.2.1-fixoverflow.patch 506 RMD160 ffed85a677dc3ff32ca65e97b5af2a17e4a52f2b SHA1 5639a4715b05587316699807f3647612444b8d94 SHA256 3f97013477a1ce9ee421ffe70c1ed3a24435ee7c85d2a665b4c4a21bded789c4
 AUX openslp-compile_fix.patch 574 RMD160 315a9f05b5a7b84f4e6ec4c1cd64106a9310a5b9 SHA1 3576d1c626e279815ed0ffe2414c30f6fd1cdfa7 SHA256 421b03369c0a1360a8d1363bc01d5cc6e60a303a1d0abd3644680f1d2487b7d4
 AUX openslp-no_install_doc.patch 678 RMD160 790bcc1490be78f14ebdd27f68e06556c7e7e65a SHA1 851e4ec85b06a16732df5cb1dda520a122d65a62 SHA256 9da35fee802bb3463a8d5c3b8522a009ff1d29c2ba35b623010124c1b8215343
 AUX openslp-opt.patch 949 RMD160 1ec7491e5047d88e9686e51954ca8f832119d40e SHA1 6c8dd36bcd04f320af9f81a443afd28afdf6ec3c SHA256 125e94c06af9091556ad0ce8f428368853dec8be2547e71f1d1f82915f0a1785
-AUX slpd-init 2309 RMD160 57a6c5753783142ad54643a9796b054c31d5b6c4 SHA1 875b7bb64426e43cf38c2e8781b674a8ad531574 SHA256 53242a4f0c370b06394806767d1ea6d492b5882a3319fe75c0316e557ffbb773
+AUX slpd-init 2313 RMD160 aa9d0f522c3b2a3f6e1bb398f05f80445d74dfa2 SHA1 f5c77afc9e891de10909c9885ae783aee83021f6 SHA256 7f228796e020c0779c52683f684197d50662ae890b1ae193ffa9acf157ccd143
 DIST openslp-1.2.1.tar.gz 886195 RMD160 a31d516ba784ad893a740946082fe5e0f15a37ea SHA1 47ab19154084d2b467f09525f5351e9ab7193cf9 SHA256 08c7ec1e76fdd66461b3784d52047f594405f31ba2791ab0c1ec7c97639f5fbd
 EBUILD openslp-1.2.1-r1.ebuild 988 RMD160 07a358dc97532ae59a94273a8a26ea28bf97ad9f SHA1 596757fe53fdac6ca434ea620dd1cc11c513b529 SHA256 95f0a5633df503c9a950a97aa3362f7b3fa6d28aad06fed66ab20e3fc87fe5eb
 EBUILD openslp-1.2.1-r2.ebuild 1085 RMD160 ef288651708c174f69de892cd4d0798a875d4321 SHA1 ee00bbceab9fe857291b4a2abf43f37852609415 SHA256 a4c2cfd50b131ad70be57c6c714eb1514dfb7297a3c636a37ef32cb745977a6f
-MISC ChangeLog 6335 RMD160 ea8389bfbf0f859ac7edc3a87c79d896e3954fac SHA1 2e98f937d1b8e7c8ce62b03ad59b1d267f4e8bca SHA256 8ef632622fd3e0fa2fa78e6f376cfc97a2d2d140e1d3dc09ccd1ba2cd150e7c3
+MISC ChangeLog 6736 RMD160 bbc8ded942f86ce5a274cdbc5bb673ee48e43dc2 SHA1 6770e65a44bc2c83333de1056a60178ee47a0d11 SHA256 f8623abda4a31878d04e85a9ef4c8b433df5efa566ab84738540f10a6a6661ad
 MISC metadata.xml 162 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c SHA1 97a164202fb2c7165cdbd9721ea05b4ac2724035 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJPHzZ0AAoJENwGBM22xffelLIP/1Djg/ASqLjPeQoFXN7Se5qa
-hcwHhvpTq887y5dYt4L7SJCKQitVpUmLEASF3qce9eIL/Bps39ZeG2lRy00ba1GT
-A9C2x3XyPJQbp11Iz4MXH3gDog2EbNEM4vKBn6vgS/RO8KL/L+1ZhUYFzjctRe+1
-V2TOtw4KUMx1W3dGWSBsZaK19Ch+JQzaxJAVPIBMvM/3uitT1xqxSeTay9MP+qZl
-mf1OHMGKlKV0SHkW+CsmpLra5rGscLUBHGedP+RpnOVWNpXlnL1ihrUCLBqspcIO
-fpyiDPoR3S1K2F3s7N9w40AxLsSLWJi4ZsNNyGq4lxulFyG2xag121b3UpUxVsHK
-SDeE+yqYdFF6n9IUHTYjV2RFPr/fvMwlqlQWhWXzyvpelec9+4AH/sOg94KbapLr
-ePthFv9XAdDZkcLj2KV6QbpyKO6zIXLkdV4mYWd1YjtAVfLwof3vh9XBGlp/AuGG
-c7Wb/OOCxsKUKvhyc7YvadUaZxJ00g4A6ZxTDsGnKGmavqB1Qi7Evclfl//ERlVT
-OhagUB6iWRdSCFFGWe6FYBYMorrr/GUBYSJQwvZ8isJtR/unXUKyuBQCsXALIb7O
-eBnIH7qL+Yo2+NB+9U1Auf1viBmsgeYZY61ip9XS5aKNSqsWgfn/MSUbGIXnUI/U
-0vpRoVijQTWs9u7QxVwo
-=Lxb7
------END PGP SIGNATURE-----
diff --git a/net-libs/openslp/files/slpd-init b/net-libs/openslp/files/slpd-init
index 68657200dd34..bbc0eac1abc3 100644
--- a/net-libs/openslp/files/slpd-init
+++ b/net-libs/openslp/files/slpd-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/files/slpd-init,v 1.4 2007/07/13 13:20:28 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/files/slpd-init,v 1.5 2012/02/09 08:19:35 robbat2 Exp $
 
 depend() {
 	need net
@@ -27,7 +27,7 @@ multicast_route_set() {
 	MSG_FAILED_TO_ADD=' FAILED - Route NOT Added.'
 	MSG_SUCCES_ON_ADD=' SUCCESS - Route Added.'
 
-	CMD_GET_INTERFACE="netstat -i | awk 'BEGIN{}(NR>2)&&(!/^lo*/){print \$1}'"
+	CMD_GET_INTERFACE="netstat -i | awk 'BEGIN{}(NR>2)&&(!/^lo*/){print \$1;exit}'"
 	CMD_ADD_ROUTE="route add -net 224.0.0.0 netmask 240.0.0.0"
 
 	ping $PING_OPTIONS_1 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null