| 1 |
commit: b1c1d69d38ad18c714de176c332e1798ac19e3b5 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 27 15:19:25 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 27 15:19:25 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c1d69d |
| 7 |
|
| 8 |
sys-apps/dbus-broker: fix build with USE="apparmor -audit" |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/873082 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/dbus-broker/dbus-broker-32.ebuild | 4 ++++ |
| 14 |
.../files/dbus-broker-32-apparmor-libaudit.patch | 26 ++++++++++++++++++++++ |
| 15 |
2 files changed, 30 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sys-apps/dbus-broker/dbus-broker-32.ebuild b/sys-apps/dbus-broker/dbus-broker-32.ebuild |
| 18 |
index 9345691d61b5..b910903b5f10 100644 |
| 19 |
--- a/sys-apps/dbus-broker/dbus-broker-32.ebuild |
| 20 |
+++ b/sys-apps/dbus-broker/dbus-broker-32.ebuild |
| 21 |
@@ -41,6 +41,10 @@ BDEPEND=" |
| 22 |
virtual/pkgconfig |
| 23 |
" |
| 24 |
|
| 25 |
+PATCHES=( |
| 26 |
+ "${FILESDIR}/dbus-broker-32-apparmor-libaudit.patch" |
| 27 |
+) |
| 28 |
+ |
| 29 |
if [[ ${PV} == 9999 ]]; then |
| 30 |
src_unpack() { |
| 31 |
git-r3_src_unpack |
| 32 |
|
| 33 |
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 |
| 34 |
new file mode 100644 |
| 35 |
index 000000000000..95bdb9a407e0 |
| 36 |
--- /dev/null |
| 37 |
+++ b/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch |
| 38 |
@@ -0,0 +1,26 @@ |
| 39 |
+From ef1c9f03a6be40474486044b6a28780d12107d9b Mon Sep 17 00:00:00 2001 |
| 40 |
+From: Mike Gilbert <floppym@g.o> |
| 41 |
+Date: Mon, 26 Sep 2022 14:07:29 -0400 |
| 42 |
+Subject: [PATCH] Drop '#include <libaudit.h>' from src/util/apparmor.c |
| 43 |
+ |
| 44 |
+This header does not seem to be required. |
| 45 |
+Tested with -Dapparmor=true and -Daudit=true/-Daudit=false. |
| 46 |
+ |
| 47 |
+Bug: https://bugs.gentoo.org/873082 |
| 48 |
+Signed-off-by: Mike Gilbert <floppym@g.o> |
| 49 |
+--- |
| 50 |
+ src/util/apparmor.c | 1 - |
| 51 |
+ 1 file changed, 1 deletion(-) |
| 52 |
+ |
| 53 |
+diff --git a/src/util/apparmor.c b/src/util/apparmor.c |
| 54 |
+index f319ffcf..4b7a7809 100644 |
| 55 |
+--- a/src/util/apparmor.c |
| 56 |
++++ b/src/util/apparmor.c |
| 57 |
+@@ -8,7 +8,6 @@ |
| 58 |
+ |
| 59 |
+ #include <c-rbtree.h> |
| 60 |
+ #include <c-stdaux.h> |
| 61 |
+-#include <libaudit.h> |
| 62 |
+ #include <stdlib.h> |
| 63 |
+ #include <stdio.h> |
| 64 |
+ #include <sys/apparmor.h> |
Archives