Fixed init script to work with all options and stop correctly with

  baselayout<1.12 wrt #108464

  ifplugd.action is now installed to /etc

Package-Manager: portage-2.0.51.22-r3

8 files changed, 47 insertions, 57 deletions

diff --git a/sys-apps/ifplugd/ChangeLog b/sys-apps/ifplugd/ChangeLog
index 7d5d72e3cd32..3b5f6c0fe120 100644
--- a/sys-apps/ifplugd/ChangeLog
+++ b/sys-apps/ifplugd/ChangeLog
@@ -1,6 +1,17 @@
 # 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.27 2005/09/08 14:37:32 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.28 2005/10/10 07:39:01 uberlord Exp $
+
+*ifplugd-0.28-r3 (10 Oct 2005)
+
+  10 Oct 2005; Roy Marples <uberlord@gentoo.org>
+  -files/ifplugd-0.26-gentoo.diff, +files/ifplugd-0.28-nlapi.diff,
+  files/ifplugd.init, metadata.xml, -ifplugd-0.28-r2.ebuild,
+  +ifplugd-0.28-r3.ebuild:
+  Fixed init script to work with all options and stop correctly with
+  baselayout<1.12 wrt #108464
+  
+  ifplugd.action is now installed to /etc
 
 *ifplugd-0.28-r2 (08 Sep 2005)
 
diff --git a/sys-apps/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index 3239d824bf42..e0e283725afc 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -1,14 +1,14 @@
-MD5 aa52a3d6cec02302e5223291dddf0486 ifplugd-0.28-r2.ebuild 1301
-MD5 54f5a06d95ccfbca878aae6a6385ae49 ChangeLog 5178
-MD5 50ddf6de7cdf5ef045d0189c47e4e452 metadata.xml 258
 MD5 e6ac7d869a0eb46fcd8069766bcf9370 ifplugd-0.28.ebuild 1445
-MD5 e4322329d76406800bd7810f7d1869cd files/ifplugd-0.28-gentoo.diff 1119
+MD5 479a5b1f7943c36f7fd0d1fca6a08cf6 ChangeLog 5559
+MD5 1bd3caa19d3ba48815c07566f45e7c11 ifplugd-0.28-r3.ebuild 1329
+MD5 d13433a9981e2386ff10934a71b003a6 metadata.xml 359
 MD5 0f11772693878629fb851b68920004c5 files/gentoo-ifplugd.action-v2 703
-MD5 35e218c1d5eadc7f98f2759eecb9c651 files/gentoo-ifplugd-init-v3 2685
-MD5 aaff46e0cdc7f78ba616e8093700cadf files/ifplugd.conf 2255
+MD5 c110adefe6c3d268c4c1e861d120fe3a files/digest-ifplugd-0.28-r3 64
+MD5 b85f99eae3afefda5a054752b3b51d5c files/ifplugd.init 3938
 MD5 6279601f12e6444faa6c118df03e1e3c files/ifplugd.action 999
-MD5 fe09c9793c01678c251ee8a988009151 files/ifplugd.init 3948
-MD5 35a51405ec02cf2cf0116b7b75d98294 files/ifplugd-0.26-gentoo.diff 1547
-MD5 c110adefe6c3d268c4c1e861d120fe3a files/digest-ifplugd-0.28 64
-MD5 c110adefe6c3d268c4c1e861d120fe3a files/digest-ifplugd-0.28-r2 64
+MD5 d16fbcdc0a1c6f5be1aa3bf0c3a932f6 files/ifplugd-0.28-nlapi.diff 639
+MD5 35e218c1d5eadc7f98f2759eecb9c651 files/gentoo-ifplugd-init-v3 2685
 MD5 046da68d6aa7665b0d3a9fd9e5a67b6a files/gentoo-ifplugd-conf-v3 2248
+MD5 c110adefe6c3d268c4c1e861d120fe3a files/digest-ifplugd-0.28 64
+MD5 aaff46e0cdc7f78ba616e8093700cadf files/ifplugd.conf 2255
+MD5 e4322329d76406800bd7810f7d1869cd files/ifplugd-0.28-gentoo.diff 1119
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.28-r2 b/sys-apps/ifplugd/files/digest-ifplugd-0.28-r3
index a53e0fb022c3..a53e0fb022c3 100644
--- a/sys-apps/ifplugd/files/digest-ifplugd-0.28-r2
+++ b/sys-apps/ifplugd/files/digest-ifplugd-0.28-r3
diff --git a/sys-apps/ifplugd/files/ifplugd-0.26-gentoo.diff b/sys-apps/ifplugd/files/ifplugd-0.26-gentoo.diff
deleted file mode 100644
index d5e65f900134..000000000000
--- a/sys-apps/ifplugd/files/ifplugd-0.26-gentoo.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN ifplugd-0.26.orig/configure ifplugd-0.26/configure
---- ifplugd-0.26.orig/configure	2004-12-20 08:39:14.684706181 -0500
-+++ ifplugd-0.26/configure	2004-12-20 08:39:50.184734260 -0500
-@@ -3644,7 +3644,7 @@
- 
- # If using GCC specify some additional parameters
- if test "x$GCC" = "xyes" ; then
--   CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"
-+   CFLAGS="$CFLAGS -W -Wall"
- 
-    cat >conftest.$ac_ext <<_ACEOF
- int main() {}
-diff -urN ifplugd-0.26.orig/src/ifplugd.c ifplugd-0.26/src/ifplugd.c
---- ifplugd-0.26.orig/src/ifplugd.c	2004-12-20 08:39:14.682706517 -0500
-+++ ifplugd-0.26/src/ifplugd.c	2004-12-20 08:40:56.903506651 -0500
-@@ -64,7 +64,7 @@
- 	interface_do_message = 1;
- 
- char *interface = NULL;
--char *run = SYSCONFDIR"/ifplugd/ifplugd.action";
-+char *run = "/usr/sbin/ifplugd.action";
- char *extra_arg = NULL;
- 
- int polltime = 1,
-diff -urN ifplugd-0.26.orig/src/nlapi.c ifplugd-0.26/src/nlapi.c
---- ifplugd-0.26.orig/src/nlapi.c	2004-12-20 08:39:14.682706517 -0500
-+++ ifplugd-0.26/src/nlapi.c	2004-12-20 08:39:50.185734092 -0500
-@@ -86,7 +86,7 @@
-         for (; bytes > 0; p = NLMSG_NEXT(p, bytes)) {
-             struct callback_info *c;
-             
--            if (!NLMSG_OK(p, bytes) || (size_t) bytes < sizeof(struct nlmsghdr) || (size_t) bytes < p->nlmsg_len) {
-+            if (!NLMSG_OK(p, (size_t) bytes) || (size_t) bytes < sizeof(struct nlmsghdr) || (size_t) bytes < (size_t) p->nlmsg_len) {
-                 daemon_log(LOG_ERR, "NLAPI: Packet too small or truncated!\n");
-                 return -1;
-             }
diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-nlapi.diff b/sys-apps/ifplugd/files/ifplugd-0.28-nlapi.diff
new file mode 100644
index 000000000000..b640543eebc9
--- /dev/null
+++ b/sys-apps/ifplugd/files/ifplugd-0.28-nlapi.diff
@@ -0,0 +1,12 @@
+diff -urN src/nlapi.c src/nlapi.c
+--- src/nlapi.c	2004-12-20 08:39:14.682706517 -0500
++++ src/nlapi.c	2004-12-20 08:39:50.185734092 -0500
+@@ -86,7 +86,7 @@
+         for (; bytes > 0; p = NLMSG_NEXT(p, bytes)) {
+             struct callback_info *c;
+             
+-            if (!NLMSG_OK(p, bytes) || (size_t) bytes < sizeof(struct nlmsghdr) || (size_t) bytes < p->nlmsg_len) {
++            if (!NLMSG_OK(p, (size_t) bytes) || (size_t) bytes < sizeof(struct nlmsghdr) || (size_t) bytes < (size_t) p->nlmsg_len) {
+                 daemon_log(LOG_ERR, "NLAPI: Packet too small or truncated!\n");
+                 return -1;
+             }
diff --git a/sys-apps/ifplugd/files/ifplugd.init b/sys-apps/ifplugd/files/ifplugd.init
index fff6f04f3bd2..f78a517a7bfd 100644
--- a/sys-apps/ifplugd/files/ifplugd.init
+++ b/sys-apps/ifplugd/files/ifplugd.init
@@ -1,7 +1,7 @@
 #!/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.2 2005/09/08 14:37:32 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/ifplugd.init,v 1.3 2005/10/10 07:39:01 uberlord Exp $
 
 #NB: Config is in /etc/conf.d/ifplugd
 
@@ -98,11 +98,11 @@ start() {
 		
 		is_set "${iface}" AUTO yes || args="${args}a"
 		is_set "${iface}" BEEP yes || args="${args}b"
-		is_set "${iface}" IGNORE_FAIL yes && args="${iargs}f"
-		is_set "${iface}" IGNORE_FAIL_POSITIVE no && args="${iargs}F"
-		is_set "${iface}" IGNORE_RETVAL yes && args="${iargs}I"
-		is_set "${iface}" WAIT_ON_FORK yes && args="${iargs}w"
-		is_set "${iface}" MONITOR no && args="${iargs}M"
+		is_set "${iface}" IGNORE_FAIL yes && args="${args}f"
+		is_set "${iface}" IGNORE_FAIL_POSITIVE no && args="${args}F"
+		is_set "${iface}" IGNORE_RETVAL yes && args="${args}I"
+		is_set "${iface}" WAIT_ON_FORK yes && args="${args}w"
+		is_set "${iface}" MONITOR no && args="${args}M"
 
 		[[ -n ${args} ]] && args="-${args}"
 
@@ -136,7 +136,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 SIGQUIT
+			--pidfile "/var/run/ifplugd.${iface}.pid" --signal 3 
 		eend $? || allstopped=false
 	done
 
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r2.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r3.ebuild
index ee9ac34dc186..5104091719ac 100644
--- a/sys-apps/ifplugd/ifplugd-0.28-r2.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.28-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28-r2.ebuild,v 1.1 2005/09/08 14:37:32 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28-r3.ebuild,v 1.1 2005/10/10 07:39:01 uberlord Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ DEPEND="dev-util/pkgconfig
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/${P}-nlapi.diff"
 }
 
 src_compile() {
@@ -40,7 +40,9 @@ src_install() {
 
 	insinto /etc/conf.d ; newins "${FILESDIR}/${PN}.conf" "${PN}" || die
 	exeinto /etc/init.d ; newexe "${FILESDIR}/${PN}.init" "${PN}" || die
-	exeinto /usr/sbin ; newexe "${FILESDIR}/${PN}.action" "${PN}.action"
+	dodir "/etc/${PN}"
+	exeinto "/etc/${PN}"
+	newexe "${FILESDIR}/${PN}.action" "${PN}.action" || die
 
 	cd "${S}/doc"
 	dodoc README SUPPORTED_DRIVERS
diff --git a/sys-apps/ifplugd/metadata.xml b/sys-apps/ifplugd/metadata.xml
index 18949c79c267..4621429df8da 100644
--- a/sys-apps/ifplugd/metadata.xml
+++ b/sys-apps/ifplugd/metadata.xml
@@ -6,4 +6,5 @@
 		<email>uberlord@gentoo.org</email>
 		<name>Roy Marples</name>
 	</maintainer>
+	<longdescription>Brings up/down ethernet ports automatically with cable detection</longdescription>
 </pkgmetadata>