[PATCHv2 2/3] busybox: update to 1.33

[Hannu Nyman]

Rosen Penev kirjoitti 5.1.2021 klo 0.29:
> On Sun, Jan 3, 2021 at 10:14 PM Hannu Nyman <hannu.nyman at iki.fi> wrote:
>> Rosen Penev kirjoitti 4.1.2021 klo 5.32:
>>> 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.
>>>
>>> ...
>>>
>>> @@ -2170,8 +2184,7 @@ config BUSYBOX_DEFAULT_WATCHDOG
>>>        default n
>>>    config BUSYBOX_DEFAULT_FEATURE_IPV6
>>>        bool
>>> -     default y if IPV6
>>> -     default n
>>> +     default y
>>>    config BUSYBOX_DEFAULT_FEATURE_UNIX_LOCAL
>>>        bool
>>>        default n
>>>
>> Rosen,
>>
>> Looks like you are here accidentally eliminating the OpenWrt specific logic
>> for IPv6 flag. (I specifically mentioned that in the commit message that
>> Hauke referenced to you, so that it would be noticed in future busybox
>> upgrades. IPV6 config flag is not part of the native busybox logic, so the
>> defaults generation script misfires regarding it.)
>>
>> Please remove the patch section that removes the global IPV6 option's impact.
>> If you remove the IPV6 logic, busybox will be compiled with IPv6 although the
>> user has disabled it in OpenWrt menuconfig.
> It seems the config section is not refreshed either in this patch.
> That is, the other Config.in files. No idea how to update those.


I am not sure what you mean. I simply requested that you remove the erroneous 
modification of the IPV6 option from your patch, so that the IPV6 feature 
default is left as it is. Like here:

https://github.com/openwrt/openwrt/blob/master/package/utils/busybox/Config-defaults.in#L2171-L2174


The defaults refreshing script erroneously sets also that option to built-in 
busybox default, as busybox sources do not know about the downstream OpenWrt 
IPV6 config option.

Just remove manually the section

@@ -2170,8 +2184,7 @@ config BUSYBOX_DEFAULT_WATCHDOG
       default n
   config BUSYBOX_DEFAULT_FEATURE_IPV6
       bool
-     default y if IPV6
-     default n
+     default y
   config BUSYBOX_DEFAULT_FEATURE_UNIX_LOCAL
       bool
       default n


Or do you think that there is something else wrong reagrding the other defaults in Config-defaults.in in your patch?
To me your patch looks sensible otherwise, except this IPV6 change.