X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbusybox%2Fpatches%2F100-killall5.patch;h=9828224800941e4d5e5733fbcff5ab0e74d68928;hb=e43e63574b774d1c2a832a64cb8173340fc094b9;hp=161b7e6f25db956d0b4118611ca046e20192d322;hpb=cb65b9f302340185d2ca410b284d30f4117f7966;p=openwrt-10.03%2F.git

diff --git a/package/busybox/patches/100-killall5.patch b/package/busybox/patches/100-killall5.patch
index 161b7e6f2..982822480 100644
--- a/package/busybox/patches/100-killall5.patch
+++ b/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 -ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new/include/applets.h
+--- busybox-1.2.0-old/include/applets.h	2006-07-01 00:42:10.000000000 +0200
++++ busybox-1.2.0-new/include/applets.h	2006-07-31 00:29:34.000000000 +0200
+@@ -157,6 +157,7 @@
+ USE_IPTUNNEL(APPLET(iptunnel, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_KILL(APPLET(kill, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_KILLALL(APPLET_ODDNAME(killall, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall))
++USE_KILLALL5(APPLET_ODDNAME(killall5, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall5))
+ USE_KLOGD(APPLET(klogd, _BB_DIR_SBIN, _BB_SUID_NEVER))
+ USE_LASH(APPLET(lash, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_LAST(APPLET(last, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+diff -ruN busybox-1.2.0-old/include/usage.h busybox-1.2.0-new/include/usage.h
+--- busybox-1.2.0-old/include/usage.h	2006-07-01 00:42:10.000000000 +0200
++++ busybox-1.2.0-new/include/usage.h	2006-07-31 00:25:57.000000000 +0200
+@@ -1503,6 +1503,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 -ruN busybox-1.2.0-old/procps/Config.in busybox-1.2.0-new/procps/Config.in
+--- busybox-1.2.0-old/procps/Config.in	2006-07-01 00:42:12.000000000 +0200
++++ busybox-1.2.0-new/procps/Config.in	2006-07-31 00:25:57.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
-@@ -34,6 +34,7 @@
+diff -ruN busybox-1.2.0-old/procps/kill.c busybox-1.2.0-new/procps/kill.c
+--- busybox-1.2.0-old/procps/kill.c	2006-07-01 00:42:12.000000000 +0200
++++ busybox-1.2.0-new/procps/kill.c	2006-07-31 00:25:57.000000000 +0200
+@@ -20,6 +20,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 @@
+@@ -34,6 +35,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 @@
+@@ -112,6 +116,20 @@
  		}
  
  	}