diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-01-31 16:15:53 -0800 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-02-14 15:15:32 +0100 |
| commit | 0275ee5dde7c36c925396779dd23d4f470ab40e1 (patch) | |
| tree | 88e07de1fa39b6c9909478b0909e617523d6c830 /package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch | |
| parent | 157cd0bd97bcfec8a34d4ebb558f37bee4f0515f (diff) | |
| download | upstream-0275ee5dde7c36c925396779dd23d4f470ab40e1.tar.gz upstream-0275ee5dde7c36c925396779dd23d4f470ab40e1.tar.bz2 upstream-0275ee5dde7c36c925396779dd23d4f470ab40e1.zip | |
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>
Diffstat (limited to 'package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch')
| -rw-r--r-- | package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch index 3741e25c3f..0389eed5da 100644 --- a/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch +++ b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch @@ -1,6 +1,6 @@ --- a/networking/traceroute.c +++ b/networking/traceroute.c -@@ -237,8 +237,8 @@ +@@ -236,8 +236,8 @@ //config: depends on TRACEROUTE || TRACEROUTE6 /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */ |