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
64a64be7ff
.patch
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
This commit is contained in:
parent
19291ee195
commit
0e34107963
2 changed files with 33 additions and 1 deletions
|
@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=apparmor
|
PKG_NAME:=apparmor
|
||||||
PKG_VERSION:=3.0.3
|
PKG_VERSION:=3.0.3
|
||||||
PKG_RELEASE:=5
|
PKG_RELEASE:=6
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:=https://gitlab.com/apparmor/apparmor/-/archive/v$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://gitlab.com/apparmor/apparmor/-/archive/v$(PKG_VERSION)
|
||||||
|
|
32
utils/apparmor/patches/100-add-missing-cstdint-include.patch
Normal file
32
utils/apparmor/patches/100-add-missing-cstdint-include.patch
Normal file
|
@ -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
|
Loading…
Reference in a new issue