add a simple maintenance tool for kernel config files

[openwrt.git] / package / busybox / patches / 150-udhcp-release.patch

diff --git a/package/busybox/patches/150-udhcp-release.patch b/package/busybox/patches/150-udhcp-release.patch
index 8f9665f..1e1c00e 100644 (file)
--- a/package/busybox/patches/150-udhcp-release.patch
+++ b/package/busybox/patches/150-udhcp-release.patch
@@ -1,18 +1,18 @@
-diff -Nur busybox-1.1.0-pre1/include/usage.h busybox-1.1.0-pre1.openwrt/include/usage.h
---- busybox-1.1.0-pre1/include/usage.h 2005-11-01 00:55:34.000000000 +0100
-+++ busybox-1.1.0-pre1.openwrt/include/usage.h 2005-11-30 11:10:24.000000000 +0100
-@@ -3119,6 +3119,7 @@
+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-31 10:47:56.000000000 +0200
++++ busybox-1.2.0-new/include/usage.h  2006-07-31 11:08:49.000000000 +0200
+@@ -3190,6 +3190,7 @@
        "\t-n,\t--now\tExit with failure if lease cannot be immediately negotiated\n" \
        "\t-p,\t--pidfile=file\tStore process ID of daemon in file\n" \
        "\t-q,\t--quit\tQuit after obtaining lease\n" \
 +      "\t-R,\t--release\tRelease IP on quit\n" \
        "\t-r,\t--request=IP\tIP address to request (default: none)\n" \
        "\t-s,\t--script=file\tRun file at dhcp events (default: /usr/share/udhcpc/default.script)\n" \
-       "\t-v,\t--version\tDisplay version"
-diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.c busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.c
---- busybox-1.1.0-pre1/networking/udhcp/dhcpc.c        2005-11-01 00:55:15.000000000 +0100
-+++ busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.c        2005-11-30 11:17:22.000000000 +0100
-@@ -61,6 +61,7 @@
+       "\t-t,\t--retries=NUM\tSend up to NUM request packets\n"\
+diff -ruN busybox-1.2.0-old/networking/udhcp/dhcpc.c busybox-1.2.0-new/networking/udhcp/dhcpc.c
+--- busybox-1.2.0-old/networking/udhcp/dhcpc.c 2006-07-01 00:42:02.000000000 +0200
++++ busybox-1.2.0-new/networking/udhcp/dhcpc.c 2006-07-31 11:08:49.000000000 +0200
+@@ -47,6 +47,7 @@
        .abort_if_no_lease = 0,
        .foreground = 0,
        .quit_after_lease = 0,
@@ -20,32 +20,24 @@ diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.c busybox-1.1.0-pre1.openwrt
        .background_if_no_lease = 0,
        .interface = "eth0",
        .pidfile = NULL,
-@@ -92,6 +93,7 @@
- "                                  immediately negotiated.\n"
- "  -p, --pidfile=file              Store process ID of daemon in file\n"
- "  -q, --quit                      Quit after obtaining lease\n"
-+"  -R, --release                   Release IP on quit\n"
- "  -r, --request=IP                IP address to request (default: none)\n"
- "  -s, --script=file               Run file at dhcp events (default:\n"
- "                                  " DEFAULT_SCRIPT ")\n"
-@@ -211,6 +213,7 @@
-               {"now",         no_argument,            0, 'n'},
+@@ -163,6 +164,7 @@
+               {"now",         no_argument,            0, 'n'},
                {"pidfile",     required_argument,      0, 'p'},
                {"quit",        no_argument,            0, 'q'},
 +              {"release",     no_argument,            0, 'R'},
                {"request",     required_argument,      0, 'r'},
                {"script",      required_argument,      0, 's'},
-               {"version",     no_argument,            0, 'v'},
-@@ -220,7 +223,7 @@
+               {"timeout",     required_argument,      0, 'T'},
+@@ -174,7 +176,7 @@
        /* get options */
        while (1) {
                int option_index = 0;
--              c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:v", arg_options, &option_index);
-+              c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:v", arg_options, &option_index);
+-              c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:T:t:v", arg_options, &option_index);
++              c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v", arg_options, &option_index);
                if (c == -1) break;
  
                switch (c) {
-@@ -290,6 +293,9 @@
+@@ -244,6 +246,9 @@
                case 'q':
                        client_config.quit_after_lease = 1;
                        break;
@@ -55,7 +47,7 @@ diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.c busybox-1.1.0-pre1.openwrt
                case 'r':
                        requested_ip = inet_addr(optarg);
                        break;
-@@ -527,8 +533,11 @@
+@@ -488,8 +493,11 @@
  
                                        state = BOUND;
                                        change_mode(LISTEN_NONE);
@@ -68,7 +60,7 @@ diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.c busybox-1.1.0-pre1.openwrt
                                        if (!client_config.foreground)
                                                client_background();
  
-@@ -553,12 +562,13 @@
+@@ -514,12 +522,13 @@
                        case SIGUSR1:
                                perform_renew();
                                break;
@@ -85,10 +77,10 @@ diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.c busybox-1.1.0-pre1.openwrt
                        }
                } else if (retval == -1 && errno == EINTR) {
                        /* a signal was caught */
-diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.h busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.h
---- busybox-1.1.0-pre1/networking/udhcp/dhcpc.h        2005-11-01 00:55:15.000000000 +0100
-+++ busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.h        2005-11-30 11:18:00.000000000 +0100
-@@ -19,6 +19,7 @@
+diff -ruN busybox-1.2.0-old/networking/udhcp/dhcpc.h busybox-1.2.0-new/networking/udhcp/dhcpc.h
+--- busybox-1.2.0-old/networking/udhcp/dhcpc.h 2006-07-01 00:42:02.000000000 +0200
++++ busybox-1.2.0-new/networking/udhcp/dhcpc.h 2006-07-31 11:08:49.000000000 +0200
+@@ -18,6 +18,7 @@
  struct client_config_t {
        char foreground;                /* Do not fork */
        char quit_after_lease;          /* Quit after obtaining lease */