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

4 files changed, 19 insertions, 43 deletions

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