diff options
Diffstat (limited to 'meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch')
-rw-r--r-- | meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch deleted file mode 100644 index b755a263a4..0000000000 --- a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | From 682fb48c137b687477008b68863c2a0b73ed47d1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | ||
3 | Date: Fri, 9 Sep 2016 16:00:42 -0300 | ||
4 | Subject: [PATCH] handle read-only files | ||
5 | |||
6 | Patch from: | ||
7 | https://github.com/darealshinji/patchelf/commit/40e66392bc4b96e9b4eda496827d26348a503509 | ||
8 | |||
9 | Upstream-Status: Denied [https://github.com/NixOS/patchelf/pull/89] | ||
10 | |||
11 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
12 | |||
13 | --- | ||
14 | src/patchelf.cc | 16 +++++++++++++++- | ||
15 | 1 file changed, 15 insertions(+), 1 deletion(-) | ||
16 | |||
17 | Index: git/src/patchelf.cc | ||
18 | =================================================================== | ||
19 | --- git.orig/src/patchelf.cc | ||
20 | +++ git/src/patchelf.cc | ||
21 | @@ -534,9 +534,19 @@ void ElfFile<ElfFileParamNames>::sortShd | ||
22 | |||
23 | static void writeFile(const std::string & fileName, const FileContents & contents) | ||
24 | { | ||
25 | + struct stat st; | ||
26 | + int fd; | ||
27 | + | ||
28 | debug("writing %s\n", fileName.c_str()); | ||
29 | |||
30 | - int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); | ||
31 | + if (stat(fileName.c_str(), &st) != 0) | ||
32 | + error("stat"); | ||
33 | + | ||
34 | + if (chmod(fileName.c_str(), 0600) != 0) | ||
35 | + error("chmod"); | ||
36 | + | ||
37 | + fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); | ||
38 | + | ||
39 | if (fd == -1) | ||
40 | error("open"); | ||
41 | |||
42 | @@ -551,8 +561,6 @@ static void writeFile(const std::string | ||
43 | bytesWritten += portion; | ||
44 | } | ||
45 | |||
46 | - if (close(fd) >= 0) | ||
47 | - return; | ||
48 | /* | ||
49 | * Just ignore EINTR; a retry loop is the wrong thing to do. | ||
50 | * | ||
51 | @@ -561,9 +569,11 @@ static void writeFile(const std::string | ||
52 | * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR | ||
53 | * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain | ||
54 | */ | ||
55 | - if (errno == EINTR) | ||
56 | - return; | ||
57 | - error("close"); | ||
58 | + if ((close(fd) < 0) && errno != EINTR) | ||
59 | + error("close"); | ||
60 | + | ||
61 | + if (chmod(fileName.c_str(), st.st_mode) != 0) | ||
62 | + error("chmod"); | ||
63 | } | ||
64 | |||
65 | |||