diff options
| author | Oskari Rauta <oskari.rauta@gmail.com> | 2023-05-27 10:05:20 +0300 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2023-05-28 09:30:11 +0300 |
| commit | 0e34107963e3d503ed4dd7a9b9dc6b75596d5474 (patch) | |
| tree | 98bd2050ed0290e7f499a658c07b132ec2ab3404 /utils/apparmor/patches | |
| parent | 19291ee1951a79776c1b67c10fd67af5d346abc5 (diff) | |
apparmor: gcc 13 compatibility fix
when built with gcc 13, fixes following error:
capability.h:46:6: error: variable or field '__debug_capabilities' declared void
46 | void __debug_capabilities(uint64_t capset, const char *name);
| ^~~~~~~~~~~~~~~~~~~~
capability.h:46:27: error: 'uint64_t' was not declared in this scope
patch is back ported from upstream patch at
https://gitlab.com/apparmor/apparmor/-/commit/64a64be7ffb5a84f27daa9f37ae8ad92800943d3.patch
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
Diffstat (limited to 'utils/apparmor/patches')
| -rw-r--r-- | utils/apparmor/patches/100-add-missing-cstdint-include.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/utils/apparmor/patches/100-add-missing-cstdint-include.patch b/utils/apparmor/patches/100-add-missing-cstdint-include.patch new file mode 100644 index 000000000..ff60ee271 --- /dev/null +++ b/utils/apparmor/patches/100-add-missing-cstdint-include.patch @@ -0,0 +1,32 @@ +From 64a64be7ffb5a84f27daa9f37ae8ad92800943d3 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Mon, 23 May 2022 23:12:31 +0100 +Subject: [PATCH] parser/capability.h: add missing <cstdint> include + +Without the change apparmor build fails on this week's gcc-13 snapshot as: + + capability.h:66:6: error: variable or field '__debug_capabilities' declared void + 66 | void __debug_capabilities(uint64_t capset, const char *name); + | ^~~~~~~~~~~~~~~~~~~~ + capability.h:66:27: error: 'uint64_t' was not declared in this scope + 66 | void __debug_capabilities(uint64_t capset, const char *name); + | ^~~~~~~~ + capability.h:23:1: note: 'uint64_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? + 22 | #include <linux/capability.h> + +++ |+#include <cstdint> + 23 | +--- + parser/capability.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/parser/capability.h ++++ b/parser/capability.h +@@ -19,6 +19,8 @@ + #ifndef __AA_CAPABILITY_H + #define __AA_CAPABILITY_H + ++#include <cstdint> ++ + #define NO_BACKMAP_CAP 0xff + + #ifndef CAP_PERFMON |