summaryrefslogtreecommitdiffstats
path: root/openwrt/package/busybox/patches/100-killall5.patch
diff options
context:
space:
mode:
Diffstat (limited to 'openwrt/package/busybox/patches/100-killall5.patch')
-rw-r--r--openwrt/package/busybox/patches/100-killall5.patch52
1 files changed, 25 insertions, 27 deletions
diff --git a/openwrt/package/busybox/patches/100-killall5.patch b/openwrt/package/busybox/patches/100-killall5.patch
index 161b7e6f2..6f1585d0d 100644
--- a/openwrt/package/busybox/patches/100-killall5.patch
+++ b/openwrt/package/busybox/patches/100-killall5.patch
@@ -1,20 +1,18 @@
-diff -urN busybox-dist/include/applets.h busybox/include/applets.h
---- busybox-dist/include/applets.h 2004-03-13 02:33:09.000000000 -0600
-+++ busybox/include/applets.h 2004-03-16 09:45:29.000000000 -0600
-@@ -313,6 +313,9 @@
- #ifdef CONFIG_KILLALL
- APPLET(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
- #endif
-+#ifdef CONFIG_KILLALL5
-+ APPLET(killall5, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
-+#endif
- #ifdef CONFIG_KLOGD
- APPLET(klogd, klogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
- #endif
-diff -urN busybox-dist/include/usage.h busybox/include/usage.h
---- busybox-dist/include/usage.h 2004-03-13 02:33:09.000000000 -0600
-+++ busybox/include/usage.h 2004-03-16 09:45:29.000000000 -0600
-@@ -1389,6 +1389,13 @@
+diff -Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt/include/applets.h
+--- busybox-1.1.1/include/applets.h 2006-03-22 22:16:24.000000000 +0100
++++ busybox-1.1.1-owrt/include/applets.h 2006-04-01 18:23:43.000000000 +0200
+@@ -154,6 +154,7 @@
+ USE_IPTUNNEL(APPLET(iptunnel, iptunnel_main, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_KILL(APPLET(kill, kill_main, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_KILLALL(APPLET(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
++USE_KILLALL5(APPLET(killall5, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_KLOGD(APPLET(klogd, klogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
+ USE_LASH(APPLET(lash, lash_main, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_LAST(APPLET(last, last_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h
+--- busybox-1.1.1/include/usage.h 2006-03-22 22:16:24.000000000 +0100
++++ busybox-1.1.1-owrt/include/usage.h 2006-04-01 18:22:53.000000000 +0200
+@@ -1598,6 +1598,13 @@
#define killall_example_usage \
"$ killall apache\n"
@@ -28,10 +26,10 @@ diff -urN busybox-dist/include/usage.h busybox/include/usage.h
#define klogd_trivial_usage \
"[-c n] [-n]"
#define klogd_full_usage \
-diff -urN busybox-dist/procps/Config.in busybox/procps/Config.in
---- busybox-dist/procps/Config.in 2003-12-24 00:02:11.000000000 -0600
-+++ busybox/procps/Config.in 2004-03-16 09:45:29.000000000 -0600
-@@ -30,6 +30,11 @@
+diff -Nur busybox-1.1.1/procps/Config.in busybox-1.1.1-owrt/procps/Config.in
+--- busybox-1.1.1/procps/Config.in 2006-03-22 22:16:25.000000000 +0100
++++ busybox-1.1.1-owrt/procps/Config.in 2006-04-01 18:22:53.000000000 +0200
+@@ -38,6 +38,11 @@
specified commands. If no signal name is specified, SIGTERM is
sent.
@@ -43,18 +41,18 @@ diff -urN busybox-dist/procps/Config.in busybox/procps/Config.in
config CONFIG_PIDOF
bool "pidof"
default n
-diff -urN busybox-dist/procps/kill.c busybox/procps/kill.c
---- busybox-dist/procps/kill.c 2004-03-15 02:29:03.000000000 -0600
-+++ busybox/procps/kill.c 2004-03-16 09:45:29.000000000 -0600
+diff -Nur busybox-1.1.1/procps/kill.c busybox-1.1.1-owrt/procps/kill.c
+--- busybox-1.1.1/procps/kill.c 2006-03-22 22:16:25.000000000 +0100
++++ busybox-1.1.1-owrt/procps/kill.c 2006-04-01 18:22:53.000000000 +0200
@@ -34,6 +34,7 @@
#define KILL 0
#define KILLALL 1
+#define KILLALL5 2
- extern int kill_main(int argc, char **argv)
+ int kill_main(int argc, char **argv)
{
-@@ -47,6 +48,9 @@
+@@ -48,6 +49,9 @@
#else
whichApp = KILL;
#endif
@@ -64,7 +62,7 @@ diff -urN busybox-dist/procps/kill.c busybox/procps/kill.c
/* Parse any options */
if (argc < 2)
-@@ -119,6 +123,20 @@
+@@ -126,6 +130,20 @@
}
}