busybox: nslookup_lede: fix compatibility with v1.25

[openwrt/openwrt.git] / package / utils / busybox / patches / 230-add_nslookup_lede.patch

diff --git a/package/utils/busybox/patches/230-add_nslookup_lede.patch b/package/utils/busybox/patches/230-add_nslookup_lede.patch
index 51034e6bc4390057f93e77ad7c0d60598220f9e9..f37f4bd8797b7b2ba46162f2daa5a50fdc3e736a 100644 (file)
--- a/package/utils/busybox/patches/230-add_nslookup_lede.patch
+++ b/package/utils/busybox/patches/230-add_nslookup_lede.patch
@@ -1,4 +1,4 @@
-From 2285cd400a10b1bde5472fe1cec3311300ee943c Mon Sep 17 00:00:00 2001
+From 1188f159e0b0a9c07bed835c7313bedf5322a9e3 Mon Sep 17 00:00:00 2001

 From: Jo-Philipp Wich <jo@mein.io>
 Date: Tue, 14 Mar 2017 22:21:34 +0100
 Subject: [PATCH] networking: add LEDE nslookup applet
 From: Jo-Philipp Wich <jo@mein.io>
 Date: Tue, 14 Mar 2017 22:21:34 +0100
 Subject: [PATCH] networking: add LEDE nslookup applet


@@ -12,16 +12,16 @@ and the libresolv primitives to parse received DNS responses.
 
 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 ---
 
 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 ---

- networking/nslookup_lede.c | 893 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 893 insertions(+)
+ networking/nslookup_lede.c | 894 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 894 insertions(+)

  create mode 100644 networking/nslookup_lede.c
 
 diff --git a/networking/nslookup_lede.c b/networking/nslookup_lede.c
 new file mode 100644
  create mode 100644 networking/nslookup_lede.c
 
 diff --git a/networking/nslookup_lede.c b/networking/nslookup_lede.c
 new file mode 100644

-index 000000000..6f1f86502
+index 000000000..f3e42d3bb

 --- /dev/null
 +++ b/networking/nslookup_lede.c
 --- /dev/null
 +++ b/networking/nslookup_lede.c

-@@ -0,0 +1,893 @@
+@@ -0,0 +1,894 @@

 +/*
 + * nslookup_lede - musl compatible replacement for busybox nslookup
 + *
 +/*
 + * nslookup_lede - musl compatible replacement for busybox nslookup
 + *


@@ -760,6 +760,7 @@ index 000000000..6f1f86502
 +      applet_long_options = nslookup_longopts;
 +#endif
 +
 +      applet_long_options = nslookup_longopts;
 +#endif
 +

++      opt_complementary = "q::";

 +      opts = getopt32(argv, "+q:*p:+r:+t:+s",
 +                      &type_strings, &default_port,
 +                      &default_retry, &default_timeout);
 +      opts = getopt32(argv, "+q:*p:+r:+t:+s",
 +                      &type_strings, &default_port,
 +                      &default_retry, &default_timeout);