toolchain: musl: refresh patches

Refresh the musl patches

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch b/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch
index 13914efcbaccc24a261b4b5ede055d410dd00e0c..81c96ad76c3a761593ceba8ccb5013b84ac39f07 100644 (file)
--- a/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch
+++ b/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch
@@ -9,8 +9,6 @@ Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
  src/misc/nftw.c | 35 ++++++++++++++++++++++++++++++-----
  2 files changed, 38 insertions(+), 5 deletions(-)
 
-diff --git a/include/ftw.h b/include/ftw.h
-index b15c062a..ce85deac 100644
 --- a/include/ftw.h
 +++ b/include/ftw.h
 @@ -21,6 +21,14 @@ extern "C" {
@@ -28,17 +26,15 @@ index b15c062a..ce85deac 100644
  struct FTW {
        int base;
        int level;
-diff --git a/src/misc/nftw.c b/src/misc/nftw.c
-index 8dcff7fe..0bb7b601 100644
 --- a/src/misc/nftw.c
 +++ b/src/misc/nftw.c
 @@ -1,3 +1,4 @@
 +#define _GNU_SOURCE
  #include <ftw.h>
  #include <dirent.h>
- #include <fcntl.h>
-@@ -72,8 +73,20 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
-               if (!fd_limit) close(dfd);
+ #include <sys/stat.h>
+@@ -63,8 +64,20 @@ static int do_nftw(char *path, int (*fn)
+               lev.base = k;
        }
  
 -      if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev)))
@@ -60,7 +56,7 @@ index 8dcff7fe..0bb7b601 100644
  
        for (; h; h = h->chain)
                if (h->dev == st.st_dev && h->ino == st.st_ino)
-@@ -101,7 +114,10 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
+@@ -88,7 +101,10 @@ static int do_nftw(char *path, int (*fn)
                                strcpy(path+j+1, de->d_name);
                                if ((r=do_nftw(path, fn, fd_limit-1, flags, &new))) {
                                        closedir(d);
@@ -72,7 +68,7 @@ index 8dcff7fe..0bb7b601 100644
                                }
                        }
                        closedir(d);
-@@ -112,8 +128,16 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
+@@ -98,8 +114,16 @@ static int do_nftw(char *path, int (*fn)
        }
  
        path[l] = 0;
@@ -91,12 +87,9 @@ index 8dcff7fe..0bb7b601 100644
  
        return 0;
  }
-@@ -139,4 +163,5 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str
+@@ -125,4 +149,5 @@ int nftw(const char *path, int (*fn)(con
        return r;
  }
  
 +#undef nftw64
  weak_alias(nftw, nftw64);
--- 
-2.17.1
-

diff --git a/toolchain/musl/patches/700-wcsnrtombs-cve-2020-28928.diff b/toolchain/musl/patches/700-wcsnrtombs-cve-2020-28928.diff
index 8465f9422a81bbc0e05e2facb5e4637145467a46..5840dc1aac2b70767cd5e03f1b86ac0b00fae2d5 100644 (file)
--- a/toolchain/musl/patches/700-wcsnrtombs-cve-2020-28928.diff
+++ b/toolchain/musl/patches/700-wcsnrtombs-cve-2020-28928.diff
@@ -1,5 +1,3 @@
-diff --git a/src/multibyte/wcsnrtombs.c b/src/multibyte/wcsnrtombs.c
-index 676932b5..95e25e70 100644
 --- a/src/multibyte/wcsnrtombs.c
 +++ b/src/multibyte/wcsnrtombs.c
 @@ -1,41 +1,33 @@