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>
master
Kevin Darbyshire-Bryant 7 years ago committed by Hans Dedecker
parent d726187367
commit b61a648e4a
  1. 4
      package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch
  2. 7
      package/utils/busybox/patches/600-cve-2017-16544.patch

@ -1,7 +1,7 @@
--- a/networking/traceroute.c --- a/networking/traceroute.c
+++ b/networking/traceroute.c +++ b/networking/traceroute.c
@@ -239,8 +239,8 @@ @@ -237,8 +237,8 @@
//config: Add option -I to use ICMP ECHO instead of UDP datagrams. //config: depends on TRACEROUTE || TRACEROUTE6
/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */ /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
-//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE)) -//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))

@ -12,11 +12,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
libbb/lineedit.c | 12 ++++++++++++ libbb/lineedit.c | 12 ++++++++++++
1 file changed, 12 insertions(+) 1 file changed, 12 insertions(+)
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index c0e35bb..56e8140 100644
--- a/libbb/lineedit.c --- a/libbb/lineedit.c
+++ b/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) static void add_match(char *matched)
{ {
@ -35,6 +33,3 @@ index c0e35bb..56e8140 100644
matches = xrealloc_vector(matches, 4, num_matches); matches = xrealloc_vector(matches, 4, num_matches);
matches[num_matches] = matched; matches[num_matches] = matched;
num_matches++; num_matches++;
--
cgit v0.12

Loading…
Cancel
Save