From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus-broker/files/, sys-apps/dbus-broker/
Date: Tue, 27 Sep 2022 15:20:43 +0000 (UTC) [thread overview]
Message-ID: <1664291965.b1c1d69d38ad18c714de176c332e1798ac19e3b5.floppym@gentoo> (raw)
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 <floppym@gentoo.org>
+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 <floppym@gentoo.org>
+---
+ 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>
next reply other threads:[~2022-09-27 15:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 15:20 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-19 20:07 [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus-broker/files/, sys-apps/dbus-broker/ Mike Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1664291965.b1c1d69d38ad18c714de176c332e1798ac19e3b5.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox