commit:     b1c1d69d38ad18c714de176c332e1798ac19e3b5
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 15:19:25 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 15:19:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c1d69d

sys-apps/dbus-broker: fix build with USE="apparmor -audit"

Closes: https://bugs.gentoo.org/873082
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/dbus-broker/dbus-broker-32.ebuild         |  4 ++++
 .../files/dbus-broker-32-apparmor-libaudit.patch   | 26 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/sys-apps/dbus-broker/dbus-broker-32.ebuild 
b/sys-apps/dbus-broker/dbus-broker-32.ebuild
index 9345691d61b5..b910903b5f10 100644
--- a/sys-apps/dbus-broker/dbus-broker-32.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-32.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
        virtual/pkgconfig
 "
 
+PATCHES=(
+       "${FILESDIR}/dbus-broker-32-apparmor-libaudit.patch"
+)
+
 if [[ ${PV} == 9999 ]]; then
 src_unpack() {
        git-r3_src_unpack

diff --git a/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch 
b/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch
new file mode 100644
index 000000000000..95bdb9a407e0
--- /dev/null
+++ b/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch
@@ -0,0 +1,26 @@
+From ef1c9f03a6be40474486044b6a28780d12107d9b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <[email protected]>
+Date: Mon, 26 Sep 2022 14:07:29 -0400
+Subject: [PATCH] Drop '#include <libaudit.h>' from src/util/apparmor.c
+
+This header does not seem to be required.
+Tested with -Dapparmor=true and -Daudit=true/-Daudit=false.
+
+Bug: https://bugs.gentoo.org/873082
+Signed-off-by: Mike Gilbert <[email protected]>
+---
+ src/util/apparmor.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/util/apparmor.c b/src/util/apparmor.c
+index f319ffcf..4b7a7809 100644
+--- a/src/util/apparmor.c
++++ b/src/util/apparmor.c
+@@ -8,7 +8,6 @@
+ 
+ #include <c-rbtree.h>
+ #include <c-stdaux.h>
+-#include <libaudit.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/apparmor.h>

Reply via email to