- rel 2; fix build with external printf (like on mksh)

[packages/busybox.git] / busybox-dhcp.patch

diff --git a/busybox-dhcp.patch b/busybox-dhcp.patch
index 7f20a54153a6c96dc6fce61cbc51fe69613752f9..f708b247a068209b746f6cc269270cd37bb9e34a 100644 (file)
--- a/busybox-dhcp.patch
+++ b/busybox-dhcp.patch
@@ -1,25 +1,13 @@
-diff -urN busybox-1.00-pre10.org/networking/udhcp/options.c busybox-1.00-pre10/networking/udhcp/options.c
---- busybox-1.00-pre10.org/networking/udhcp/options.c  2004-06-05 20:24:43.698887752 +0200
-+++ busybox-1.00-pre10/networking/udhcp/options.c      2004-06-05 20:26:15.241971088 +0200
-@@ -27,8 +27,8 @@
-       {"hostname",    OPTION_STRING | OPTION_REQ,             0x0c},
-       {"bootsize",    OPTION_U16,                             0x0d},
-       {"domain",      OPTION_STRING | OPTION_REQ,             0x0f},
--      {"swapsvr",     OPTION_IP,                              0x10},
--      {"rootpath",    OPTION_STRING,                          0x11},
-+      {"swapsvr",     OPTION_IP | OPTION_REQ,                 0x10},
-+      {"rootpath",    OPTION_STRING | OPTION_REQ,             0x11},
-       {"ipttl",       OPTION_U8,                              0x17},
-       {"mtu",         OPTION_U16,                             0x1a},
-       {"broadcast",   OPTION_IP | OPTION_REQ,                 0x1c},
-@@ -39,8 +39,8 @@
-       {"dhcptype",    OPTION_U8,                              0x35},
-       {"serverid",    OPTION_IP,                              0x36},
-       {"message",     OPTION_STRING,                          0x38},
--      {"tftp",        OPTION_STRING,                          0x42},
--      {"bootfile",    OPTION_STRING,                          0x43},
-+      {"tftp",        OPTION_STRING | OPTION_REQ,             0x42},
-+      {"bootfile",    OPTION_STRING | OPTION_REQ,             0x43},
-       {"",            0x00,                           0x00}
- };
- 
+--- busybox-1.17.3/networking/udhcp/common.c~  2010-10-09 22:57:14.000000000 +0300
++++ busybox-1.17.3/networking/udhcp/common.c   2010-11-08 21:36:56.660518687 +0200
+@@ -32,8 +32,8 @@
+       { OPTION_STRING               | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
+       { OPTION_U16                              , 0x0d }, /* DHCP_BOOT_SIZE     */
+       { OPTION_STRING               | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */
+-      { OPTION_IP                               , 0x10 }, /* DHCP_SWAP_SERVER   */
+-      { OPTION_STRING                           , 0x11 }, /* DHCP_ROOT_PATH     */
++      { OPTION_IP                   | OPTION_REQ, 0x10 }, /* DHCP_SWAP_SERVER   */
++      { OPTION_STRING               | OPTION_REQ, 0x11 }, /* DHCP_ROOT_PATH     */
+       { OPTION_U8                               , 0x17 }, /* DHCP_IP_TTL        */
+       { OPTION_U16                              , 0x1a }, /* DHCP_MTU           */
+       { OPTION_IP                   | OPTION_REQ, 0x1c }, /* DHCP_BROADCAST     */