busybox: clean up patch fuzz

Refresh patches to tidy up fuzz.  No functional changes

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>

diff --git a/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch
index 7fa06a68c7306f033736659567a4bfc1f50ada45..3741e25c3f6e8c1ec3901a704c8c93e618119846 100644 (file)
--- a/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch
+++ b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch
@@ -1,7 +1,7 @@
 --- a/networking/traceroute.c
 +++ b/networking/traceroute.c
-@@ -239,8 +239,8 @@
- //config:       Add option -I to use ICMP ECHO instead of UDP datagrams.
+@@ -237,8 +237,8 @@
+ //config:     depends on TRACEROUTE || TRACEROUTE6
  
  /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
 -//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))

diff --git a/package/utils/busybox/patches/600-cve-2017-16544.patch b/package/utils/busybox/patches/600-cve-2017-16544.patch
index cbbdd53e9f7c565342d6cfb8687386a544dbef3e..3b142bdd64144135cfafc2e4c49df29ec3673238 100644 (file)
--- a/package/utils/busybox/patches/600-cve-2017-16544.patch
+++ b/package/utils/busybox/patches/600-cve-2017-16544.patch
@@ -12,11 +12,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
  libbb/lineedit.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/libbb/lineedit.c b/libbb/lineedit.c
-index c0e35bb..56e8140 100644
 --- a/libbb/lineedit.c
 +++ b/libbb/lineedit.c
-@@ -645,6 +645,18 @@ static void free_tab_completion_data(void)
+@@ -633,6 +633,18 @@ static void free_tab_completion_data(voi
  
  static void add_match(char *matched)
  {
@@ -35,6 +33,3 @@ index c0e35bb..56e8140 100644
        matches = xrealloc_vector(matches, 4, num_matches);
        matches[num_matches] = matched;
        num_matches++;
--- 
-cgit v0.12
-