diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2021-06-23 17:15:03 +0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2021-07-10 05:16:26 -0700 |
| commit | 366bd7026fe5a6d4d8465b87118948de97f2310f (patch) | |
| tree | b92f05fa138313da5cfaf0f22ecb4b90c0871ce6 /recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch | |
| parent | 5fbf2b8b7f4c21f1cdbb2f9e198704165aec569c (diff) | |
| download | meta-security-366bd7026fe5a6d4d8465b87118948de97f2310f.tar.gz | |
apparmor: upgrade 3.0 -> 3.0.1
Drop backport patches:
0001-apparmor-fix-manpage-order.patch
0001-libapparmor-add-missing-include-for-socklen_t.patch
0002-libapparmor-add-aa_features_new_from_file-to-public-.patch
0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch
0001-aa_status-Fix-build-issue-with-musl.patch
0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Diffstat (limited to 'recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch')
| -rw-r--r-- | recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch b/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch deleted file mode 100644 index 2a56d8b..0000000 --- a/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From 47263a3a74d7973e7a54b17db6aa903701468ffd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Patrick Steinhardt <ps@pks.im> | ||
| 3 | Date: Sat, 3 Oct 2020 20:37:55 +0200 | ||
| 4 | Subject: [PATCH] libapparmor: add missing include for `socklen_t` | ||
| 5 | |||
| 6 | While `include/sys/apparmor.h` makes use of `socklen_t`, it doesn't | ||
| 7 | include the `<sys/socket.h>` header to make its declaration available. | ||
| 8 | While this works on systems using glibc via transitive includes, it | ||
| 9 | breaks compilation on musl libc. | ||
| 10 | |||
| 11 | Fix the issue by including the header. | ||
| 12 | |||
| 13 | Signed-off-by: Patrick Steinhardt <ps@pks.im> | ||
| 14 | |||
| 15 | Upstream-Status: Backport | ||
| 16 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
| 17 | |||
| 18 | --- | ||
| 19 | libraries/libapparmor/include/sys/apparmor.h | 1 + | ||
| 20 | 1 file changed, 1 insertion(+) | ||
| 21 | |||
| 22 | diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h | ||
| 23 | index 32892d06..d70eff94 100644 | ||
| 24 | --- a/libraries/libapparmor/include/sys/apparmor.h | ||
| 25 | +++ b/libraries/libapparmor/include/sys/apparmor.h | ||
| 26 | @@ -21,6 +21,7 @@ | ||
| 27 | #include <stdbool.h> | ||
| 28 | #include <stdint.h> | ||
| 29 | #include <unistd.h> | ||
| 30 | +#include <sys/socket.h> | ||
| 31 | #include <sys/types.h> | ||
| 32 | |||
| 33 | #ifdef __cplusplus | ||
| 34 | -- | ||
| 35 | 2.17.1 | ||
| 36 | |||
