[PATCHv3 2/3] busybox: update to 1.33
Hauke Mehrtens
hauke at hauke-m.de
Wed Feb 3 18:55:32 EST 2021
On 2/1/21 1:15 AM, Rosen Penev wrote:
> 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.
>
> Signed-off-by: Rosen Penev <rosenp at gmail.com>
> ---
> v2: refreshed config and slight rewording.
> package/utils/busybox/Config-defaults.in | 48 ++++++-
> package/utils/busybox/Makefile | 6 +-
> package/utils/busybox/config/Config.in | 38 ++++--
> .../utils/busybox/config/archival/Config.in | 2 +-
> .../busybox/config/console-tools/Config.in | 13 --
> .../utils/busybox/config/coreutils/Config.in | 10 +-
> .../utils/busybox/config/e2fsprogs/Config.in | 1 -
> .../utils/busybox/config/findutils/Config.in | 8 ++
> .../busybox/config/klibc-utils/Config.in | 1 -
> package/utils/busybox/config/libbb/Config.in | 2 -
> .../utils/busybox/config/miscutils/Config.in | 36 +----
> .../utils/busybox/config/modutils/Config.in | 6 -
> .../utils/busybox/config/networking/Config.in | 68 ++++++----
> .../busybox/config/networking/udhcp/Config.in | 2 -
> package/utils/busybox/config/procps/Config.in | 3 -
> package/utils/busybox/config/shell/Config.in | 124 ++++++++++--------
> .../utils/busybox/config/sysklogd/Config.in | 10 +-
> .../utils/busybox/config/util-linux/Config.in | 62 ++-------
> .../config/util-linux/volume_id/Config.in | 6 +
> .../001-remove-stime-function-calls.patch | 84 ------------
> .../patches/010-fix-wrong-variable.patch | 11 ++
> .../patches/110-no_static_libgcc.patch | 11 --
> .../busybox/patches/120-lto-jobserver.patch | 6 +-
> .../patches/200-udhcpc_reduce_msgs.patch | 4 +-
> .../patches/201-udhcpc_changed_ifindex.patch | 2 +-
> .../203-udhcpc_renew_no_deconfig.patch | 2 +-
> .../patches/230-add_nslookup_lede.patch | 6 +-
> .../busybox/patches/250-date-k-flag.patch | 92 -------------
> .../500-move-traceroute-applets-to-bin.patch | 2 +-
> ...520-loginutils-handle-crypt-failures.patch | 6 +-
> .../patches/600-allow-ntpd-non-root.patch | 12 --
> 31 files changed, 255 insertions(+), 429 deletions(-)
> delete mode 100644 package/utils/busybox/patches/001-remove-stime-function-calls.patch
> create mode 100644 package/utils/busybox/patches/010-fix-wrong-variable.patch
> delete mode 100644 package/utils/busybox/patches/110-no_static_libgcc.patch
> delete mode 100644 package/utils/busybox/patches/250-date-k-flag.patch
> delete mode 100644 package/utils/busybox/patches/600-allow-ntpd-non-root.patch
Do we want to merge this into OpenWrt master before the 21.X branch is
created?
As 21.X is delayed again I would prefer to merge this now, then we have
a more recent base for potential security updates later.
The commit message should probably extended with some content Hannu
suggested.
Hauke
More information about the openwrt-devel
mailing list