From: Zoltan HERPAI <wigyori@uid0.hu>
Date: Tue, 7 Nov 2017 08:45:55 +0000 (+0100)
Subject: merge: busybox: update CONFIG_NSLOOKUP in busybox config and respective patch
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d1ba4834720c243baca2b572e9575399ead6914a;p=openwrt%2Fstaging%2Fblogic.git

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

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
---

diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
index 79059e50698c..2a8d9dd39714 100644
--- a/package/utils/busybox/Config-defaults.in
+++ b/package/utils/busybox/Config-defaults.in
@@ -2332,10 +2332,10 @@ config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
 config BUSYBOX_DEFAULT_NSLOOKUP
 	bool
 	default n
-config BUSYBOX_DEFAULT_NSLOOKUP_LEDE
+config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
+config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
 	bool
 	default n
 config BUSYBOX_DEFAULT_NTPD
diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
index 14875d5e681a..2d2a1c4a9e7c 100644
--- a/package/utils/busybox/config/networking/Config.in
+++ b/package/utils/busybox/config/networking/Config.in
@@ -700,17 +700,17 @@ config BUSYBOX_CONFIG_NSLOOKUP
 	default BUSYBOX_DEFAULT_NSLOOKUP
 	help
 	  nslookup is a tool to query Internet name servers.
-config BUSYBOX_CONFIG_NSLOOKUP_LEDE
+config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT
 	bool "nslookup_lede"
 	depends on !BUSYBOX_CONFIG_NSLOOKUP
-	default BUSYBOX_DEFAULT_NSLOOKUP_LEDE
+	default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
 	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"
-       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
-       depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS
+       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+       depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
        help
          Support long options for the nslookup applet.
 config BUSYBOX_CONFIG_NTPD
diff --git a/package/utils/busybox/patches/230-add_nslookup_lede.patch b/package/utils/busybox/patches/230-add_nslookup_lede.patch
index e394dfb9b949..14c0e87b3381 100644
--- a/package/utils/busybox/patches/230-add_nslookup_lede.patch
+++ b/package/utils/busybox/patches/230-add_nslookup_lede.patch
@@ -53,23 +53,23 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 + */
 +
-+//config:config NSLOOKUP_LEDE
-+//config:	bool "nslookup_lede"
++//config:config NSLOOKUP_OPENWRT
++//config:	bool "nslookup_openwrt"
 +//config:	depends on !NSLOOKUP
 +//config:	default y
 +//config:	help
 +//config:	  nslookup is a tool to query Internet name servers (LEDE flavor).
 +//config:
-+//config:config FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
++//config:config FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
 +//config:       bool "Enable long options"
 +//config:       default y
-+//config:       depends on NSLOOKUP_LEDE && LONG_OPTS
++//config:       depends on NSLOOKUP_OPENWRT && LONG_OPTS
 +//config:       help
 +//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:       "[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 =
 +		"type\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;
 +	HEADER *header;
 +
-+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
++#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
 +	applet_long_options = nslookup_longopts;
 +#endif
 +