diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-01-04 21:22:38 +0000 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-01-05 10:35:51 +0100 |
| commit | b61a648e4adff13e08caca1eaf44ea3e03ae4dc8 (patch) | |
| tree | eaa1d3c2468e67ca606377e29006cef605210961 | |
| parent | d726187367dbd0b8e7ac5df881f0582f9cfbf85a (diff) | |
| download | upstream-b61a648e4adff13e08caca1eaf44ea3e03ae4dc8.tar.gz upstream-b61a648e4adff13e08caca1eaf44ea3e03ae4dc8.tar.bz2 upstream-b61a648e4adff13e08caca1eaf44ea3e03ae4dc8.zip | |
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>
| -rw-r--r-- | package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch | 4 | ||||
| -rw-r--r-- | package/utils/busybox/patches/600-cve-2017-16544.patch | 7 |
2 files changed, 3 insertions, 8 deletions
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 7fa06a68c7..3741e25c3f 100644 --- 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 cbbdd53e9f..3b142bdd64 100644 --- 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 - |