diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-09-18 23:26:26 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-09-20 22:37:02 +0200 |
| commit | 06fa1c46fc32644a54393a7a0125eba5dd9dbb3f (patch) | |
| tree | a2979d89cba346afa14d6ce8e0f38cca2800ce7b /package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch | |
| parent | ef64c8694ba1615223db933f03ec2c5e14facea5 (diff) | |
| download | master-31e0f0ae-06fa1c46fc32644a54393a7a0125eba5dd9dbb3f.tar.gz master-31e0f0ae-06fa1c46fc32644a54393a7a0125eba5dd9dbb3f.tar.bz2 master-31e0f0ae-06fa1c46fc32644a54393a7a0125eba5dd9dbb3f.zip | |
busybox: update to version 1.25.0
The following patches were removed:
010-networking-fix-uninitialized-memory-when-displaying-.patch
https://git.busybox.net/busybox/commit/?id=f2c043acfcf9dad9fd3d65821b81f89986bbe54e
030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch
https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f
204-udhcpc_src_ip_rebind.patch
https://git.busybox.net/busybox/commit/?id=abe8f7515aded80889d78c2c1c8947997918cf90
230-ntpd_delayed_resolve.patch
https://git.busybox.net/busybox/commit/?id=c8641962e4cbde48108ddfc1c105e3320778190d
https://git.busybox.net/busybox/commit/?id=e4caf1dd9ce8569371a0eeb77ccf02a572dc0f11
260-arping_missing_includes.patch
Not needed any more, still builds with musl for me.
Add in 92fd6e6f1a "busybox: fix arping applet building on musl"
The Kconfig files were updated with these commands:
cd config
../convert_menuconfig.pl .../build_dir/target-*/busybox-1.25.0
cd ..
./convert_defaults.pl < .../build_dir/target-*/busybox-1.25.0/.config > Config-defaults.in
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch')
| -rw-r--r-- | package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch b/package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch deleted file mode 100644 index 21fec5167d..0000000000 --- a/package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/networking/udhcp/dhcpc.c -+++ b/networking/udhcp/dhcpc.c -@@ -673,10 +673,10 @@ static void add_client_options(struct dh - * client reverts to using the IP broadcast address. - */ - --static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet) -+static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet, uint32_t src_nip) - { - return udhcp_send_raw_packet(packet, -- /*src*/ INADDR_ANY, CLIENT_PORT, -+ /*src*/ src_nip, CLIENT_PORT, - /*dst*/ INADDR_BROADCAST, SERVER_PORT, MAC_BCAST_ADDR, - client_config.ifindex); - } -@@ -687,7 +687,7 @@ static int bcast_or_ucast(struct dhcp_pa - return udhcp_send_kernel_packet(packet, - ciaddr, CLIENT_PORT, - server, SERVER_PORT); -- return raw_bcast_from_client_config_ifindex(packet); -+ return raw_bcast_from_client_config_ifindex(packet, ciaddr); - } - - /* Broadcast a DHCP discover packet to the network, with an optionally requested IP */ -@@ -715,7 +715,7 @@ static NOINLINE int send_discover(uint32 - - if (msgs++ < 3) - bb_info_msg("Sending discover..."); -- return raw_bcast_from_client_config_ifindex(&packet); -+ return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY); - } - - /* Broadcast a DHCP request message */ -@@ -759,7 +759,7 @@ static NOINLINE int send_select(uint32_t - - addr.s_addr = requested; - bb_info_msg("Sending select for %s...", inet_ntoa(addr)); -- return raw_bcast_from_client_config_ifindex(&packet); -+ return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY); - } - - /* Unicast or broadcast a DHCP renew message */ -@@ -827,7 +827,7 @@ static NOINLINE int send_decline(/*uint3 - udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server); - - bb_info_msg("Sending decline..."); -- return raw_bcast_from_client_config_ifindex(&packet); -+ return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY); - } - #endif - |