diff options
author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-03-27 20:06:38 +0300 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-04-03 23:26:45 +0200 |
commit | d674422a814a4458af35e79587129a161b50a1ff (patch) | |
tree | 1613b1df5b3a61d93286607349b9b4b123d6faf2 /package/utils/busybox/patches/230-add_nslookup_lede.patch | |
parent | a74fd570a23f2226afcf63f92f22bcb9df37beee (diff) | |
download | upstream-d674422a814a4458af35e79587129a161b50a1ff.tar.gz upstream-d674422a814a4458af35e79587129a161b50a1ff.tar.bz2 upstream-d674422a814a4458af35e79587129a161b50a1ff.zip |
busybox: update to 1.28.2
Update busybox to 1.28.2, refresh patches and default config.
* modify 230-add_nslookup_lede.patch as opt_complementary was removed
Also move nslookup_longopts variable declaration to be inside
the same conditional as the function itself.
* modify 250-date-k-flag.patch to match upstream (opt_complementary)
* remove 600-cve-2017-16544.patch that is upstreamed
Notes about config changes:
* Some applet-specific LONG_OPTIONS config options were removed
* Config help text indentation changed, caused lots of
text formatting changes for convert_menuconfig.pl
* convert_defaults.pl moved lots of defaults around, summary of
actual changes below
New applets/features:
---------------------
ARCH
HEXEDIT
MINIPS
NETCAT
NUKE
RESUME
RUN_INIT
SETFATTR
New options:
------------
FEATURE_CATN
FEATURE_CROND_SPECIAL_TIMES
FEATURE_LIBBUSYBOX_STATIC
FEATURE_SETPRIV_CAPABILITIES
FEATURE_SETPRIV_CAPABILITY_NAMES
FEATURE_SETPRIV_DUMP
FEATURE_SH_READ_FRAC
FEATURE_SWAPONOFF_LABEL
FEATURE_VOLUMEID_MINIX
FEATURE_XARGS_SUPPORT_ARGS_FILE
FEATURE_XARGS_SUPPORT_PARALLEL
HUSH_GETOPTS
HUSH_READONLY
HUSH_TIMES
Removed:
--------
FEATURE_HAVE_RPC
MSH
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'package/utils/busybox/patches/230-add_nslookup_lede.patch')
-rw-r--r-- | package/utils/busybox/patches/230-add_nslookup_lede.patch | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/package/utils/busybox/patches/230-add_nslookup_lede.patch b/package/utils/busybox/patches/230-add_nslookup_lede.patch index 14c0e87b33..f0ac4b51c1 100644 --- a/package/utils/busybox/patches/230-add_nslookup_lede.patch +++ b/package/utils/busybox/patches/230-add_nslookup_lede.patch @@ -34,7 +34,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> # However, on *other platforms* it fails when some of those flags --- /dev/null +++ b/networking/nslookup_lede.c -@@ -0,0 +1,915 @@ +@@ -0,0 +1,914 @@ +/* + * nslookup_lede - musl compatible replacement for busybox nslookup + * @@ -752,18 +752,6 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> + return buf; +} + -+ -+#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS -+static const char nslookup_longopts[] ALIGN1 = -+ "type\0" Required_argument "q" -+ "querytype\0" Required_argument "q" -+ "port\0" Required_argument "p" -+ "retry\0" Required_argument "r" -+ "timeout\0" Required_argument "t" -+ "stats\0" Required_argument "s" -+ ; -+#endif -+ +int nslookup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int nslookup_main(int argc, char **argv) +{ @@ -779,13 +767,24 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> + HEADER *header; + +#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS -+ applet_long_options = nslookup_longopts; -+#endif ++ static const char nslookup_longopts[] ALIGN1 = ++ "type\0" Required_argument "q" ++ "querytype\0" Required_argument "q" ++ "port\0" Required_argument "p" ++ "retry\0" Required_argument "r" ++ "timeout\0" Required_argument "t" ++ "stats\0" No_argument "s" ++ ; + -+ opt_complementary = "q::"; -+ opts = getopt32(argv, "+q:*p:+r:+t:+s", ++ opts = getopt32long(argv, "^" "+q:*p:+r:+t:+s" "\0" "q::", ++ nslookup_longopts, ++ &type_strings, &default_port, ++ &default_retry, &default_timeout); ++#else ++ opts = getopt32(argv, "^" "+q:*p:+r:+t:+s" "\0" "q::", + &type_strings, &default_port, + &default_retry, &default_timeout); ++#endif + + while (type_strings) { + ptr = llist_pop(&type_strings); |