tn3399_openwrt/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch

--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -712,6 +712,7 @@ static int bcast_or_ucast(struct dhcp_pa
 static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
 {
 	struct dhcp_packet packet;
+	static int msgs = 0;
 
 	/* Fill in: op, htype, hlen, cookie, chaddr fields,
 	 * random xid field (we override it below),
@@ -729,6 +730,7 @@ static NOINLINE int send_discover(uint32
 	 */
 	add_client_options(&packet);
 
+	if (msgs++ < 3)
 	bb_info_msg("sending %s", "discover");
 	return raw_bcast_from_client_data_ifindex(&packet, INADDR_ANY);
 }
package/busybox: update to busybox-1.7.1, include upstream patches SVN-Revision: 22659 2010-08-15 09:53:21 +00:00			`--- a/networking/udhcp/dhcpc.c`
			`+++ b/networking/udhcp/dhcpc.c`
busybox: update to 1.33 Remove stime backport. Remove static libgcc patch as upstream fixed it with BUSYBOX_DEFAULT_STATIC_LIBGCC which defauls to off. Remove date -k patch as it no longer applies. It's also pointless as busybox' hwclock utility can do the same thing. Remove ntpd patch as that seems to have been applied upstream. Add smalll patch fixing compilation with SELinux. Upstream commit 2496616b0a8d1c80cd1416b73a4847b59b9f969a renamed the variable without renaming it in the SELinux path. Refresh config and patches. Config refresh: Refresh commands, run after busybox is first built once: cd package/utils/busybox/config/ ../convert_menuconfig.pl ../../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0 cd .. ./convert_defaults.pl < ../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0/.config > Config-defaults.in Manual edits needed afterward: * Config-defaults.in: OpenWrt config symbol IPV6 logic applied to BUSYBOX_DEFAULT_FEATURE_IPV6 * Config-defaults.in: OpenWrt configTARGET_bcm53xx logic applied to BUSYBOX_DEFAULT_TRUNCATE (commit 547f1ec) * editors/Config.in: Add USE_GLIBC dependency to BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH (commit f141090) * shell/Config.in : change at "Options common to all shells" the symbol SHELL_ASH --> BUSYBOX_CONFIG_SHELL_ASH (discussion in http://lists.openwrt.org/pipermail/openwrt-devel/2021-January/033140.html Apparently our script does not see the hidden option while prepending config options with "BUSYBOX_CONFIG_" which leads to a missed dependency when the options are later evaluated.) * Edit Config.in files by adding quotes to sourced items in config/Config.in, networking/Config.in and util-linux/Config.in (commit 1da014f) Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [Added comments from Hannu Nyman to commit message] Signed-off-by: Rosen Penev <rosenp@gmail.com> 2021-02-01 00:15:53 +00:00			`@@ -712,6 +712,7 @@ static int bcast_or_ucast(struct dhcp_pa`
busybox: refresh patches SVN-Revision: 26738 2011-04-20 02:56:23 +00:00			`static NOINLINE int send_discover(uint32_t xid, uint32_t requested)`
make udhcpc silent after 3 'Sending discover ...' messages SVN-Revision: 7227 2007-05-14 16:05:17 +00:00			`{`
update busybox to 1.15.2 (#5926) SVN-Revision: 18684 2009-12-07 16:56:04 +00:00			`struct dhcp_packet packet;`
make udhcpc silent after 3 'Sending discover ...' messages SVN-Revision: 7227 2007-05-14 16:05:17 +00:00			`+ static int msgs = 0;`

busybox: refresh patches SVN-Revision: 26738 2011-04-20 02:56:23 +00:00			`/* Fill in: op, htype, hlen, cookie, chaddr fields,`
			`* random xid field (we override it below),`
busybox: update to 1.33 Remove stime backport. Remove static libgcc patch as upstream fixed it with BUSYBOX_DEFAULT_STATIC_LIBGCC which defauls to off. Remove date -k patch as it no longer applies. It's also pointless as busybox' hwclock utility can do the same thing. Remove ntpd patch as that seems to have been applied upstream. Add smalll patch fixing compilation with SELinux. Upstream commit 2496616b0a8d1c80cd1416b73a4847b59b9f969a renamed the variable without renaming it in the SELinux path. Refresh config and patches. Config refresh: Refresh commands, run after busybox is first built once: cd package/utils/busybox/config/ ../convert_menuconfig.pl ../../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0 cd .. ./convert_defaults.pl < ../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0/.config > Config-defaults.in Manual edits needed afterward: * Config-defaults.in: OpenWrt config symbol IPV6 logic applied to BUSYBOX_DEFAULT_FEATURE_IPV6 * Config-defaults.in: OpenWrt configTARGET_bcm53xx logic applied to BUSYBOX_DEFAULT_TRUNCATE (commit 547f1ec) * editors/Config.in: Add USE_GLIBC dependency to BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH (commit f141090) * shell/Config.in : change at "Options common to all shells" the symbol SHELL_ASH --> BUSYBOX_CONFIG_SHELL_ASH (discussion in http://lists.openwrt.org/pipermail/openwrt-devel/2021-January/033140.html Apparently our script does not see the hidden option while prepending config options with "BUSYBOX_CONFIG_" which leads to a missed dependency when the options are later evaluated.) * Edit Config.in files by adding quotes to sourced items in config/Config.in, networking/Config.in and util-linux/Config.in (commit 1da014f) Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [Added comments from Hannu Nyman to commit message] Signed-off-by: Rosen Penev <rosenp@gmail.com> 2021-02-01 00:15:53 +00:00			`@@ -729,6 +730,7 @@ static NOINLINE int send_discover(uint32`
busybox: refresh patches SVN-Revision: 26738 2011-04-20 02:56:23 +00:00			`*/`
package/busybox: update to busybox-1.7.1, include upstream patches SVN-Revision: 22659 2010-08-15 09:53:21 +00:00			`add_client_options(&packet);`
make udhcpc silent after 3 'Sending discover ...' messages SVN-Revision: 7227 2007-05-14 16:05:17 +00:00
			`+ if (msgs++ < 3)`
busybox: update to 1.31.0 * Update busybox to version 1.31.0. New applets: ts, i2ctransfer New (restored) feature: error/info levels in syslog messages. Leave new features disabled by default. * Refresh patches * Remove patch that was backported from upstream Config refreshed with commands below, after which the OpenWrt specific config defaults (ipv6, login session child) were corrected: make package/busybox/compile (to populate the build_dir) cd package/utils/busybox/config/ ../convert_menuconfig.pl ../../../../build_dir/target-mips_24kc_musl/busybox-1.31.0 cd package/utils/busybox ./convert_defaults.pl < ../../../build_dir/target-mips_24kc_musl/busybox-1.31.0/.config > Config-defaults.in Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> 2019-06-15 09:16:55 +00:00			`bb_info_msg("sending %s", "discover");`
			`return raw_bcast_from_client_data_ifindex(&packet, INADDR_ANY);`
busybox: update to v1.13.4 (closes: #4279) SVN-Revision: 16063 2009-05-25 17:15:39 +00:00			`}`