Don't use ifup/ifdown (fixes bug #53155), make the init script use pcmcia and hotplug if available

6 files changed, 78 insertions, 3 deletions

diff --git a/net-wireless/waproamd/ChangeLog b/net-wireless/waproamd/ChangeLog
index 027cad1e43d0..998ef511cb21 100644
--- a/net-wireless/waproamd/ChangeLog
+++ b/net-wireless/waproamd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/waproamd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/waproamd/ChangeLog,v 1.3 2004/06/25 00:47:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/waproamd/ChangeLog,v 1.4 2004/10/09 16:20:41 brix Exp $
+
+*waproamd-0.6-r1 (09 Oct 2004)
+
+  09 Oct 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/waproamd-0.6-gentoo.diff, files/waproamd.initd,
+  +waproamd-0.6-r1.ebuild:
+  Don't use ifup/ifdown (fixes bug #53155), make the init script use pcmcia and
+  hotplug if available
 
 *waproamd-0.6 (01 Mar 2004)
 
diff --git a/net-wireless/waproamd/Manifest b/net-wireless/waproamd/Manifest
index 8b02d4624eac..0ff8669779bd 100644
--- a/net-wireless/waproamd/Manifest
+++ b/net-wireless/waproamd/Manifest
@@ -1,8 +1,11 @@
 MD5 a67ca2fa2068587c18e43f53c5fa1d04 waproamd-0.4.ebuild 791
 MD5 f6030d3d90f0833b70187cce7f0508b4 waproamd-0.6.ebuild 829
+MD5 a215ac87448f65886d6dd77a48bb01e5 waproamd-0.6-r1.ebuild 769
 MD5 795d0dc6bce920017af5e2afacd1fa06 ChangeLog 608
 MD5 a2aa67a22dd7eea0ab0662fa8a65c615 metadata.xml 568
 MD5 c0c45e06231aceeb6970b76c7dfb4d88 files/waproamd.confd 434
-MD5 2e24d5f3470d705a971d9e2c5f510e61 files/waproamd.initd 905
+MD5 cbe92d4c282555441b57bbcb447c856e files/waproamd.initd 945
+MD5 ac86f452b375f8d1d804cb43bcdd86d1 files/waproamd-0.6-gentoo.diff 597
 MD5 4f49f6ad335f1b7cf6b9595e3afbc9d3 files/digest-waproamd-0.4 64
 MD5 7e88fc4acbbe77fc8f4f42210a7ae1ed files/digest-waproamd-0.6 64
+MD5 7e88fc4acbbe77fc8f4f42210a7ae1ed files/digest-waproamd-0.6-r1 64
diff --git a/net-wireless/waproamd/files/digest-waproamd-0.6-r1 b/net-wireless/waproamd/files/digest-waproamd-0.6-r1
new file mode 100644
index 000000000000..c87690dcc7bf
--- /dev/null
+++ b/net-wireless/waproamd/files/digest-waproamd-0.6-r1
@@ -0,0 +1 @@
+MD5 12c529989c7fb8fc4d551fc6c9fc7ff7 waproamd-0.6.tar.gz 127661
diff --git a/net-wireless/waproamd/files/waproamd-0.6-gentoo.diff b/net-wireless/waproamd/files/waproamd-0.6-gentoo.diff
new file mode 100644
index 000000000000..ecfb30099be1
--- /dev/null
+++ b/net-wireless/waproamd/files/waproamd-0.6-gentoo.diff
@@ -0,0 +1,22 @@
+diff -ur waproamd-0.6/conf/default.in waproamd-0.6-gentoo/conf/default.in
+--- waproamd-0.6/conf/default.in	2004-02-08 21:18:25.000000000 +0100
++++ waproamd-0.6-gentoo/conf/default.in	2004-10-09 18:04:36.035021272 +0200
+@@ -68,7 +68,16 @@
+         ;;
+ esac
+ 
+-[ "$1" = "start" ] && exec /sbin/ifup "$IFACE"
+-[ "$1" = "stop" ] && exec /sbin/ifdown "$IFACE"
++case "$1" in
++    start)
++        echo Starting interface "$IFACE"
++        /etc/init.d/net."$IFACE" start
++        ;;
++
++    stop)
++        echo Stopping interface "$IFACE"
++        /etc/init.d/net."$IFACE" stop
++        ;;
++esac
+ 
+ exit 0
diff --git a/net-wireless/waproamd/files/waproamd.initd b/net-wireless/waproamd/files/waproamd.initd
index 7c352ea74096..dbc66aa39618 100644
--- a/net-wireless/waproamd/files/waproamd.initd
+++ b/net-wireless/waproamd/files/waproamd.initd
@@ -5,6 +5,10 @@
 # Configuration resides in /etc/conf.d/waproamd.conf instead of
 # /etc/waproamd/waproamd.conf
 
+depend() {
+        use hotplug pcmcia
+}
+
 get_config() {
 	if [ -z "${INTERFACES}" -o "x${INTERFACES}" = "xauto" ]
 	then
@@ -29,7 +33,7 @@ start() {
 stop() {
 	INTERFACES="$(get_options 'ifaces')"
         ebegin "Stopping Wireless Access Point Roaming Daemon:"
-        for IF in $INTERFACES ; do 
+        for IF in $INTERFACES ; do
 	    ebegin " ${IF}"
             /usr/sbin/waproamd -k -i $IF
 	    eend $?
diff --git a/net-wireless/waproamd/waproamd-0.6-r1.ebuild b/net-wireless/waproamd/waproamd-0.6-r1.ebuild
new file mode 100644
index 000000000000..ec7f7b7d999a
--- /dev/null
+++ b/net-wireless/waproamd/waproamd-0.6-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/waproamd/waproamd-0.6-r1.ebuild,v 1.1 2004/10/09 16:20:41 brix Exp $
+
+inherit eutils
+
+DESCRIPTION="Wireless roaming daemon for configuring wireless settings"
+
+HOMEPAGE="http://www.stud.uni-hamburg.de/~lennart/projects/waproamd/"
+SRC_URI="http://0pointer.de/lennart/projects/waproamd/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libdaemon-0.5"
+
+src_unpack() {
+	unpack ${A}
+
+	cp ${FILESDIR}/waproamd.initd ${S}/conf/waproamd.init.in
+
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	econf --disable-lynx --with-initdir=${D}/etc/init.d/ || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc README
+	insinto /etc/conf.d
+	newins ${FILESDIR}/waproamd.confd waproamd
+}