Init script works with stable baselayout #125099

and now respects the SHUTDOWN configuration option again, #128988.
(Portage version: 2.1_pre7-r4)

5 files changed, 125 insertions, 23 deletions

diff --git a/sys-apps/ifplugd/ChangeLog b/sys-apps/ifplugd/ChangeLog
index 035511564713..64375e90c85a 100644
--- a/sys-apps/ifplugd/ChangeLog
+++ b/sys-apps/ifplugd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/ifplugd
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.32 2005/12/24 16:32:25 blubb Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.33 2006/04/06 12:23:08 uberlord Exp $
+
+*ifplugd-0.28-r5 (06 Apr 2006)
+
+  06 Apr 2006; Roy Marples <uberlord@gentoo.org> files/ifplugd.init,
+  +ifplugd-0.28-r5.ebuild:
+  Init script works with stable baselayout #125099
+  and now respects the SHUTDOWN configuration option again, #128988.
 
   24 Dec 2005; Simon Stelling <blubb@gentoo.org> ifplugd-0.28-r4.ebuild:
   stable on amd64
diff --git a/sys-apps/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index 06178b43547e..3f4d4e93366a 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -1,14 +1,48 @@
-MD5 31a30d4876b0dd23c638505e56b4c672 ChangeLog 6050
-MD5 5a05ef908e1630011bc176b67cfd3f12 ifplugd-0.28-r4.ebuild 1323
-MD5 e6ac7d869a0eb46fcd8069766bcf9370 ifplugd-0.28.ebuild 1445
-MD5 d13433a9981e2386ff10934a71b003a6 metadata.xml 359
+MD5 5fd9d0c8c0c90bd2da95ac07c2cddc6a ChangeLog 6299
+RMD160 100cdca1051baa660839cce89d62089d9b6d0504 ChangeLog 6299
+SHA256 155997931914d40173ba439b5508377798c96d4e53763613481957dc9c02d585 ChangeLog 6299
 MD5 c110adefe6c3d268c4c1e861d120fe3a files/digest-ifplugd-0.28 64
+RMD160 506b7bfbae8b5b3f1290a5cc221aee60cc936d4b files/digest-ifplugd-0.28 64
+SHA256 a6fa9a1f897727614b45915d01da3539bf77bef614661817e38332b4185e18d5 files/digest-ifplugd-0.28 64
 MD5 c110adefe6c3d268c4c1e861d120fe3a files/digest-ifplugd-0.28-r4 64
+RMD160 506b7bfbae8b5b3f1290a5cc221aee60cc936d4b files/digest-ifplugd-0.28-r4 64
+SHA256 a6fa9a1f897727614b45915d01da3539bf77bef614661817e38332b4185e18d5 files/digest-ifplugd-0.28-r4 64
+MD5 83ebee09d9faecc03912ee8631d7f372 files/digest-ifplugd-0.28-r5 238
+RMD160 f0dc5bf3ea7253ad7658562a12c7d2ed991069f1 files/digest-ifplugd-0.28-r5 238
+SHA256 b94ae260a7fcdbd983c2809b8df46f528f65e42a61fa3402316fb67bb17939e5 files/digest-ifplugd-0.28-r5 238
 MD5 046da68d6aa7665b0d3a9fd9e5a67b6a files/gentoo-ifplugd-conf-v3 2248
+RMD160 260115623472e1f55cccf1d0f7e9c2fd00fc5833 files/gentoo-ifplugd-conf-v3 2248
+SHA256 cd5cc217d9e9b77ac720fcbb7052514fd656e696f81bdaca07d773e3b8ee8571 files/gentoo-ifplugd-conf-v3 2248
 MD5 35e218c1d5eadc7f98f2759eecb9c651 files/gentoo-ifplugd-init-v3 2685
+RMD160 963774a8a66c466fdf560e5e96b7d418afb0a071 files/gentoo-ifplugd-init-v3 2685
+SHA256 63df2c0d2e30026b6ed1aa8dc963bcd665d924a878970241fb61594724dd3570 files/gentoo-ifplugd-init-v3 2685
 MD5 0f11772693878629fb851b68920004c5 files/gentoo-ifplugd.action-v2 703
+RMD160 ead98c0d4bb7e93c25e947f0a6e3b5c3c4295e8d files/gentoo-ifplugd.action-v2 703
+SHA256 f1ef30a8084bbbb1e6371b2b8db97fd9122d4934109db059eab84f16f79aa607 files/gentoo-ifplugd.action-v2 703
 MD5 e4322329d76406800bd7810f7d1869cd files/ifplugd-0.28-gentoo.diff 1119
+RMD160 1b5d171af4748956a93d5b2d9c06b30bb5258c26 files/ifplugd-0.28-gentoo.diff 1119
+SHA256 cf08094a51f29b638f2683766a7ccc465c7818318de665174a6aa2641d900760 files/ifplugd-0.28-gentoo.diff 1119
 MD5 d16fbcdc0a1c6f5be1aa3bf0c3a932f6 files/ifplugd-0.28-nlapi.diff 639
+RMD160 2fbf6329fb16118de0f1122aa41bca6a2906d0f3 files/ifplugd-0.28-nlapi.diff 639
+SHA256 f648c027fb446d0b25cc5dbca9db57dc33f5b8bff8dfbf1009847504f2229dfb files/ifplugd-0.28-nlapi.diff 639
 MD5 e6174a8e4c2c6b451d78267453379a51 files/ifplugd.action 891
+RMD160 1ee45a699b2402598cc4c6a18a3d294c4914a105 files/ifplugd.action 891
+SHA256 55c88d2c773bc242e81f9fe310cd48999e69543fa8e0b2389c054e8890260015 files/ifplugd.action 891
 MD5 aaff46e0cdc7f78ba616e8093700cadf files/ifplugd.conf 2255
-MD5 b85f99eae3afefda5a054752b3b51d5c files/ifplugd.init 3938
+RMD160 7cac216a7c37a041426668b5ccfe827ff702e976 files/ifplugd.conf 2255
+SHA256 d318c611efa481ab845112c12af0242093219633a980b722c14d06c1eabe5875 files/ifplugd.conf 2255
+MD5 2ec85037b2063fa110f26de75e27c081 files/ifplugd.init 4237
+RMD160 3c3d8eaff0bed0ae3dfd6a7b17250b0ff43738c1 files/ifplugd.init 4237
+SHA256 87c4a52716b5b030b28e611207495d74f5f6d944303456688668a0a7af5987fd files/ifplugd.init 4237
+MD5 5a05ef908e1630011bc176b67cfd3f12 ifplugd-0.28-r4.ebuild 1323
+RMD160 9611af66e94c0e685b82b907d95acd168833867f ifplugd-0.28-r4.ebuild 1323
+SHA256 44fc1758f70c08c497a224f828604c8af87f61bcb2792e3e9e720581cfb0dcfb ifplugd-0.28-r4.ebuild 1323
+MD5 5acea5e94e84a3437b44e65decedaffb ifplugd-0.28-r5.ebuild 1323
+RMD160 4083b1b842ab783f2880bcaa13df0fce53b70e48 ifplugd-0.28-r5.ebuild 1323
+SHA256 4cedbd87967015fb0698845f8aa645fb1ce3333e606941776dbd6105c80e602c ifplugd-0.28-r5.ebuild 1323
+MD5 e6ac7d869a0eb46fcd8069766bcf9370 ifplugd-0.28.ebuild 1445
+RMD160 ea4c5c05dcc45751d3731bfaab294e34027baa81 ifplugd-0.28.ebuild 1445
+SHA256 72cf833ee7a6c829e800ce570340ebbfa5427032e827b47cb883d1fdfbde1b17 ifplugd-0.28.ebuild 1445
+MD5 d13433a9981e2386ff10934a71b003a6 metadata.xml 359
+RMD160 a6e7020e754414ebf691db22495b6adf36c080dc metadata.xml 359
+SHA256 c2255a7d82e88d539b6acdb44db885d353f8943602c36acbe256910d776ec955 metadata.xml 359
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.28-r5 b/sys-apps/ifplugd/files/digest-ifplugd-0.28-r5
new file mode 100644
index 000000000000..d58875572dca
--- /dev/null
+++ b/sys-apps/ifplugd/files/digest-ifplugd-0.28-r5
@@ -0,0 +1,3 @@
+MD5 df6f4bab52f46ffd6eb1f5912d4ccee3 ifplugd-0.28.tar.gz 142677
+RMD160 09914a1914a4432822bb660d6aef194debe688f1 ifplugd-0.28.tar.gz 142677
+SHA256 474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0 ifplugd-0.28.tar.gz 142677
diff --git a/sys-apps/ifplugd/files/ifplugd.init b/sys-apps/ifplugd/files/ifplugd.init
index f78a517a7bfd..40082b104884 100644
--- a/sys-apps/ifplugd/files/ifplugd.init
+++ b/sys-apps/ifplugd/files/ifplugd.init
@@ -1,12 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/ifplugd.init,v 1.3 2005/10/10 07:39:01 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/ifplugd.init,v 1.4 2006/04/06 12:23:08 uberlord Exp $
 
 #NB: Config is in /etc/conf.d/ifplugd
 
-depend()
-{
+depend() {
 	use pcmcia
 }
 
@@ -18,10 +17,11 @@ get_start_interfaces() {
 		return
 	fi
 
-	INTERFACES=" $(sed -ne 's/^[ \t]*\(.*\):.*/\1/p' /proc/net/dev | xargs) "
+	INTERFACES=" $(sed -n -e 's/^[ \t]*\(.*\):.*/\1/p' /proc/net/dev | xargs) "
 	local exclude iface
 	if [[ -f /proc/net/wireless && ${WIRELESS_INTERFACES} == "no" ]]; then
-		exclude=$(sed -ne 's/^[ \t]*\(.*\):.*/\1/p' /proc/net/wireless | xargs)
+		exclude="$(sed -n -e 's/^[ \t]*\(.*\):.*/\1/p' /proc/net/wireless \
+			| xargs)"
 	fi
 	
 	# Exclude ifplugd started by other scripts - like net.xxx
@@ -41,10 +41,10 @@ get_start_interfaces() {
 }
 
 get_running_interfaces() {
-	local exclude="" INTERFACES=$(
+	local exclude="" INTERFACES="$(
 		cd /var/run
 		ls ifplugd.*.pid 2>/dev/null | sed -n -e 's/^ifplugd.\(.*\).pid$/\1/p' | xargs
-	)
+	)"
 	if [[ -d "${svcdir}/daemons" ]]; then
 		local exclude=$(
 			grep "\"/var/run/ifplugd.*.pid\"" "${svcdir}"/daemons/* 2>/dev/null \
@@ -86,7 +86,14 @@ start() {
 		local args="" pidfile="/var/run/ifplugd.${iface}.pid"
 
 		if [[ -e ${pidfile} ]] ; then
-			if is_daemon_running /usr/sbin/ifplugd "${pidfile}" ; then
+			local running=false
+			if [[ $(type -t is_daemon_running) == "function" ]] ; then
+				is_daemon_running /usr/sbin/ifplugd "${pidfile}" && running=true
+			else
+				local pid="$(< "${pidfile}")"
+				[[ " $(pidof /sbin/ifplugd) " == *" ${pid} "* ]] && running=true
+			fi
+			if ${running} ; then
 				eindent
 				einfo "ifplugd is already running on ${iface}"
 				eend 0
@@ -99,18 +106,19 @@ start() {
 		is_set "${iface}" AUTO yes || args="${args}a"
 		is_set "${iface}" BEEP yes || args="${args}b"
 		is_set "${iface}" IGNORE_FAIL yes && args="${args}f"
-		is_set "${iface}" IGNORE_FAIL_POSITIVE no && args="${args}F"
+		is_set "${iface}" IGNORE_FAIL_POSITIVE yes || args="${args}F"
 		is_set "${iface}" IGNORE_RETVAL yes && args="${args}I"
+		is_set "${iface}" SHUTDOWN yes || args="${args}q"
 		is_set "${iface}" WAIT_ON_FORK yes && args="${args}w"
-		is_set "${iface}" MONITOR no && args="${args}M"
+		is_set "${iface}" MONITOR yes || args="${args}M"
 
 		[[ -n ${args} ]] && args="-${args}"
 
-		args="${args} -t$(get_opt ${iface} POLL_TIME 1)"
-		args="${args} -u$(get_opt ${iface} DELAY_UP 0)"
-		args="${args} -d$(get_opt ${iface} DELAY_DOWN 5)"
-		args="${args} -m$(get_opt ${iface} API_MODE auto)"
-		args="${args} $(get_opt ${iface} ARGS '')"
+		args="${args} -t$(get_opt "${iface}" POLL_TIME 1)"
+		args="${args} -u$(get_opt "${iface}" DELAY_UP 0)"
+		args="${args} -d$(get_opt "${iface}" DELAY_DOWN 5)"
+		args="${args} -m$(get_opt "${iface}" API_MODE auto)"
+		args="${args} $(get_opt "${iface}" ARGS '')"
 
 		start-stop-daemon --start --exec /usr/sbin/ifplugd \
 			--pidfile "/var/run/ifplugd.${iface}.pid" \
@@ -136,7 +144,7 @@ stop() {
 	for iface in $(get_running_interfaces); do
 		ebegin "${iface}"
 		start-stop-daemon --stop --exec /usr/sbin/ifplugd \
-			--pidfile "/var/run/ifplugd.${iface}.pid" --signal 3 
+			--pidfile "/var/run/ifplugd.${iface}.pid" 
 		eend $? || allstopped=false
 	done
 
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r5.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r5.ebuild
new file mode 100644
index 000000000000..6c8079392325
--- /dev/null
+++ b/sys-apps/ifplugd/ifplugd-0.28-r5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28-r5.ebuild,v 1.1 2006/04/06 12:23:08 uberlord Exp $
+
+inherit eutils
+
+DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
+HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
+SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc"
+
+DEPEND="dev-util/pkgconfig
+	doc? ( www-client/lynx )
+	>=dev-libs/libdaemon-0.5"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-nlapi.diff"
+}
+
+src_compile() {
+	econf $(use_enable doc lynx) \
+		--with-initdir=/etc/init.d \
+		--disable-xmltoman \
+		--disable-subversion \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# Fix init.d configuration
+	rm -rf "${D}/etc/ifplugd" "${D}/etc/init.d/${PN}"
+
+	insinto /etc/conf.d ; newins "${FILESDIR}/${PN}.conf" "${PN}" || die
+	exeinto /etc/init.d ; newexe "${FILESDIR}/${PN}.init" "${PN}" || die
+	dodir "/etc/${PN}"
+	exeinto "/etc/${PN}"
+	newexe "${FILESDIR}/${PN}.action" "${PN}.action" || die
+
+	cd "${S}/doc"
+	dodoc README SUPPORTED_DRIVERS
+	use doc && dohtml *.{html,css}
+}