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