aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/musl/patches/020-verify-that-ttyname-refers-to-the-same-file-as-the-fd.patch
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2017-01-03 17:51:04 +0100
committerFelix Fietkau <nbd@nbd.name>2017-01-16 20:40:00 +0100
commita8a5cb9595cd64a48c1cea6a1478c11e022474a9 (patch)
treeea0417332a8bbea1bc2b1d2e810044558c54da51 /toolchain/musl/patches/020-verify-that-ttyname-refers-to-the-same-file-as-the-fd.patch
parentda5d060ac9171029cfde61ee45aa417696e45da0 (diff)
downloadupstream-a8a5cb9595cd64a48c1cea6a1478c11e022474a9.tar.gz
upstream-a8a5cb9595cd64a48c1cea6a1478c11e022474a9.tar.bz2
upstream-a8a5cb9595cd64a48c1cea6a1478c11e022474a9.zip
musl: update musl to 1.1.16+ and switch to download from git
This patch updates musl to 1.1.16+ [0] and removes all the backported patches. This is a major release and tagged as such. For more information visit musl-libc.org or read the WHATSNEW. Furthermore, this patch also changes musl to download directly from git. This makes it easier to update musl in the future. The patch custom Add-format-attribute-to-some-function-declarations.patch was assigned a new 400- number. This should avoid confusion since 0xx numbers are usually assigned to backports. [0] <http://git.musl-libc.org/cgit/musl/commit/?id=769f53598e781ffc89191520f3f8a93cb58db91f> Cc: Hannu Nyman <hannu.nyman@iki.fi> Cc: Koen Vandeputte <koen.vandeputte@ncentric.com> Cc: Jo-Philipp Wich <jo@mein.io> Cc: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Diffstat (limited to 'toolchain/musl/patches/020-verify-that-ttyname-refers-to-the-same-file-as-the-fd.patch')
-rw-r--r--toolchain/musl/patches/020-verify-that-ttyname-refers-to-the-same-file-as-the-fd.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/toolchain/musl/patches/020-verify-that-ttyname-refers-to-the-same-file-as-the-fd.patch b/toolchain/musl/patches/020-verify-that-ttyname-refers-to-the-same-file-as-the-fd.patch
deleted file mode 100644
index d9cd0b397b..0000000000
--- a/toolchain/musl/patches/020-verify-that-ttyname-refers-to-the-same-file-as-the-fd.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0a950dcf15bb9f7274c804dca490e9e20e475f3e Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 20 Aug 2016 21:04:31 +0200
-Subject: verify that ttyname refers to the same file as the fd
-
-linux containers use separate mount namespace so the /proc
-symlink might not point to the right device if the fd was
-opened in the parent namespace, in this case return ENOENT.
----
- src/unistd/ttyname_r.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/src/unistd/ttyname_r.c b/src/unistd/ttyname_r.c
-index 8bac7b2..a38ba4f 100644
---- a/src/unistd/ttyname_r.c
-+++ b/src/unistd/ttyname_r.c
-@@ -1,10 +1,12 @@
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/stat.h>
-
- void __procfdname(char *, unsigned);
-
- int ttyname_r(int fd, char *name, size_t size)
- {
-+ struct stat st1, st2;
- char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2];
- ssize_t l;
-
-@@ -15,8 +17,13 @@ int ttyname_r(int fd, char *name, size_t size)
-
- if (l < 0) return errno;
- else if (l == size) return ERANGE;
-- else {
-- name[l] = 0;
-- return 0;
-- }
-+
-+ name[l] = 0;
-+
-+ if (stat(name, &st1) || fstat(fd, &st2))
-+ return errno;
-+ if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
-+ return ENOENT;
-+
-+ return 0;
- }
---
-cgit v0.11.2