diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index fd407f604d..efeef07295 100644 --- a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 48c628f532f6025c2d1646b6819cd81eb789d7fb Mon Sep 17 00:00:00 2001 | 1 | From e6f871078d8d6f076c84f908fa57af15417ab87d Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Tue, 10 Oct 2017 14:33:30 -0700 | 3 | Date: Tue, 10 Oct 2017 14:33:30 -0700 |
4 | Subject: [PATCH 15/24] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() | 4 | Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() |
5 | 5 | ||
6 | Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right | 6 | Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right |
7 | thing to do and it's not portable (not supported by musl). See: | 7 | thing to do and it's not portable (not supported by musl). See: |
@@ -25,16 +25,17 @@ just historical and not actually necessary or desired behaviour? | |||
25 | Upstream-Status: Inappropriate [musl specific] | 25 | Upstream-Status: Inappropriate [musl specific] |
26 | 26 | ||
27 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 27 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
28 | |||
28 | --- | 29 | --- |
29 | src/basic/fs-util.h | 22 +++++++++++++++++++++- | 30 | src/basic/fs-util.h | 22 +++++++++++++++++++++- |
30 | src/shared/base-filesystem.c | 6 +++--- | 31 | src/shared/base-filesystem.c | 6 +++--- |
31 | 2 files changed, 24 insertions(+), 4 deletions(-) | 32 | 2 files changed, 24 insertions(+), 4 deletions(-) |
32 | 33 | ||
33 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h | 34 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h |
34 | index 7ad030b..d4cb1e9 100644 | 35 | index 78d68be9fd85..c5dc84d41868 100644 |
35 | --- a/src/basic/fs-util.h | 36 | --- a/src/basic/fs-util.h |
36 | +++ b/src/basic/fs-util.h | 37 | +++ b/src/basic/fs-util.h |
37 | @@ -32,7 +32,27 @@ int fchmod_opath(int fd, mode_t m); | 38 | @@ -40,7 +40,27 @@ int fchmod_opath(int fd, mode_t m); |
38 | 39 | ||
39 | int fd_warn_permissions(const char *path, int fd); | 40 | int fd_warn_permissions(const char *path, int fd); |
40 | 41 | ||
@@ -64,10 +65,10 @@ index 7ad030b..d4cb1e9 100644 | |||
64 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); | 65 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); |
65 | int touch(const char *path); | 66 | int touch(const char *path); |
66 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c | 67 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c |
67 | index 89d7a7d..34b4ad5 100644 | 68 | index 657407da2d37..fbd5782d84fc 100644 |
68 | --- a/src/shared/base-filesystem.c | 69 | --- a/src/shared/base-filesystem.c |
69 | +++ b/src/shared/base-filesystem.c | 70 | +++ b/src/shared/base-filesystem.c |
70 | @@ -53,7 +53,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 71 | @@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { |
71 | return log_error_errno(errno, "Failed to open root file system: %m"); | 72 | return log_error_errno(errno, "Failed to open root file system: %m"); |
72 | 73 | ||
73 | for (i = 0; i < ELEMENTSOF(table); i ++) { | 74 | for (i = 0; i < ELEMENTSOF(table); i ++) { |
@@ -76,7 +77,7 @@ index 89d7a7d..34b4ad5 100644 | |||
76 | continue; | 77 | continue; |
77 | 78 | ||
78 | if (table[i].target) { | 79 | if (table[i].target) { |
79 | @@ -61,7 +61,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 80 | @@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { |
80 | 81 | ||
81 | /* check if one of the targets exists */ | 82 | /* check if one of the targets exists */ |
82 | NULSTR_FOREACH(s, table[i].target) { | 83 | NULSTR_FOREACH(s, table[i].target) { |
@@ -85,7 +86,7 @@ index 89d7a7d..34b4ad5 100644 | |||
85 | continue; | 86 | continue; |
86 | 87 | ||
87 | /* check if a specific file exists at the target path */ | 88 | /* check if a specific file exists at the target path */ |
88 | @@ -72,7 +72,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 89 | @@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { |
89 | if (!p) | 90 | if (!p) |
90 | return log_oom(); | 91 | return log_oom(); |
91 | 92 | ||
@@ -94,6 +95,3 @@ index 89d7a7d..34b4ad5 100644 | |||
94 | continue; | 95 | continue; |
95 | } | 96 | } |
96 | 97 | ||
97 | -- | ||
98 | 2.7.4 | ||
99 | |||