KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge: busybox: update CONFIG_NSLOOKUP in busybox config and respective patch

Browse source 
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
This commit is contained in:
Zoltan HERPAI 2017-11-07 09:45:55 +01:00 committed by Felix Fietkau
parent 23f774f727
commit d1ba483472
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/utils/busybox/Config-defaults.in
View file

@ -2332,10 +2332,10 @@ config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
config BUSYBOX_DEFAULT_NSLOOKUP config BUSYBOX_DEFAULT_NSLOOKUP
bool bool
default n default n
config BUSYBOX_DEFAULT_NSLOOKUP_LEDE config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
bool bool
default y default y
config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
bool bool
default n default n
config BUSYBOX_DEFAULT_NTPD config BUSYBOX_DEFAULT_NTPD

12
package/utils/busybox/config/networking/Config.in
View file

@ -700,17 +700,17 @@ config BUSYBOX_CONFIG_NSLOOKUP
default BUSYBOX_DEFAULT_NSLOOKUP default BUSYBOX_DEFAULT_NSLOOKUP
help help
nslookup is a tool to query Internet name servers. nslookup is a tool to query Internet name servers.
config BUSYBOX_CONFIG_NSLOOKUP_LEDE config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT
bool "nslookup_lede" bool "nslookup_lede"
depends on !BUSYBOX_CONFIG_NSLOOKUP depends on !BUSYBOX_CONFIG_NSLOOKUP
default BUSYBOX_DEFAULT_NSLOOKUP_LEDE default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
help help
nslookup is a tool to query Internet name servers (LEDE flavor). nslookup is a tool to query Internet name servers (OpenWrt flavor).
config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
bool "Enable long options" bool "Enable long options"
default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
help help
Support long options for the nslookup applet. Support long options for the nslookup applet.
config BUSYBOX_CONFIG_NTPD config BUSYBOX_CONFIG_NTPD

16
package/utils/busybox/patches/230-add_nslookup_lede.patch
View file

@ -53,23 +53,23 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */ + */
+ +
+//config:config NSLOOKUP_LEDE +//config:config NSLOOKUP_OPENWRT
+//config: bool "nslookup_lede" +//config: bool "nslookup_openwrt"
+//config: depends on !NSLOOKUP +//config: depends on !NSLOOKUP
+//config: default y +//config: default y
+//config: help +//config: help
+//config: nslookup is a tool to query Internet name servers (LEDE flavor). +//config: nslookup is a tool to query Internet name servers (LEDE flavor).
+//config: +//config:
+//config:config FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS +//config:config FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+//config: bool "Enable long options" +//config: bool "Enable long options"
+//config: default y +//config: default y
+//config: depends on NSLOOKUP_LEDE && LONG_OPTS +//config: depends on NSLOOKUP_OPENWRT && LONG_OPTS
+//config: help +//config: help
+//config: Support long options for the nslookup applet. +//config: Support long options for the nslookup applet.
+ +
+//applet:IF_NSLOOKUP_LEDE(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP)) +//applet:IF_NSLOOKUP_OPENWRT(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
+ +
+//kbuild:lib-$(CONFIG_NSLOOKUP_LEDE) += nslookup_lede.o +//kbuild:lib-$(CONFIG_NSLOOKUP_OPENWRT) += nslookup_lede.o
+ +
+//usage:#define nslookup_lede_trivial_usage +//usage:#define nslookup_lede_trivial_usage
+//usage: "[HOST] [SERVER]" +//usage: "[HOST] [SERVER]"
@ -753,7 +753,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+} +}
+ +
+ +
+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS +#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+static const char nslookup_longopts[] ALIGN1 = +static const char nslookup_longopts[] ALIGN1 =
+ "type\0" Required_argument "q" + "type\0" Required_argument "q"
+ "querytype\0" Required_argument "q" + "querytype\0" Required_argument "q"
@ -778,7 +778,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+ unsigned int types = 0; + unsigned int types = 0;
+ HEADER *header; + HEADER *header;
+ +
+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS +#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+ applet_long_options = nslookup_longopts; + applet_long_options = nslookup_longopts;
+#endif +#endif
+ +