add a simple maintenance tool for kernel config files

[openwrt.git] / package / busybox / patches / 100-killall5.patch

diff --git a/package/busybox/patches/100-killall5.patch b/package/busybox/patches/100-killall5.patch
index 6f1585d..9828224 100644 (file)
--- a/package/busybox/patches/100-killall5.patch
+++ b/package/busybox/patches/100-killall5.patch
@@ -1,18 +1,18 @@
-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 @@
+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"
  
  #define killall_example_usage \
        "$ killall apache\n"
  


@@ -26,9 +26,9 @@ diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h
  #define klogd_trivial_usage \
        "[-c n] [-n]"
  #define klogd_full_usage \
  #define klogd_trivial_usage \
        "[-c n] [-n]"
  #define klogd_full_usage \

-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
+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.
 @@ -38,6 +38,11 @@
          specified commands.  If no signal name is specified, SIGTERM is
          sent.


@@ -41,10 +41,10 @@ diff -Nur busybox-1.1.1/procps/Config.in busybox-1.1.1-owrt/procps/Config.in
  config CONFIG_PIDOF
        bool "pidof"
        default n
  config CONFIG_PIDOF
        bool "pidof"
        default n

-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 @@
+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 KILL 0
  #define KILLALL 1


@@ -52,7 +52,7 @@ diff -Nur busybox-1.1.1/procps/kill.c busybox-1.1.1-owrt/procps/kill.c
  
  int kill_main(int argc, char **argv)
  {
  
  int kill_main(int argc, char **argv)
  {

-@@ -48,6 +49,9 @@
+@@ -34,6 +35,9 @@

  #else
        whichApp = KILL;
  #endif
  #else
        whichApp = KILL;
  #endif


@@ -62,7 +62,7 @@ diff -Nur busybox-1.1.1/procps/kill.c busybox-1.1.1-owrt/procps/kill.c
  
        /* Parse any options */
        if (argc < 2)
  
        /* Parse any options */
        if (argc < 2)

-@@ -126,6 +130,20 @@
+@@ -112,6 +116,20 @@

                }
  
        }
                }
  
        }