From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] apparmor: fix capability list generation
Date: Mon, 12 Oct 2020 22:03:02 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25550@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages apparmor
https://github.com/void-linux/void-packages/pull/25550
apparmor: fix capability list generation
The file `common/Make.rules` uses the C preprocessor to generate a list of capabilities and address families in some headers. For some reason, the makefile escapes the hash in `#include` statements, rendering them inoperable and making the generated headers empty. Removing the escape causes these files to be populated.
No idea why this appears to be a regression.
Fixes #25548.
@CameronNemo or @the-antz please confirm that this change results in a functioning apparmor installation.
A patch file from https://github.com/void-linux/void-packages/pull/25550.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apparmor-25550.patch --]
[-- Type: text/x-diff, Size: 920 bytes --]
From ec0b6a96274ad19b27f99446e9282e5a32686f3a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 12 Oct 2020 15:58:35 -0400
Subject: [PATCH] apparmor: fix capability list generation
Fixes #25548.
---
srcpkgs/apparmor/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index af32beacbf9..ec0c55d6c68 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
# Template file for 'apparmor'
pkgname=apparmor
version=2.13.4
-revision=3
+revision=4
wrksrc="${pkgname}-v${version}"
build_wrksrc=libraries/libapparmor
build_style=gnu-configure
@@ -23,6 +23,10 @@ if [ -z "$CROSS_BUILD" ]; then
configure_args="--with-perl --with-python"
fi
+post_patch() {
+ vsed -i ${wrksrc}/common/Make.rules -e 's/\\#include </#include </'
+}
+
pre_configure() {
autoreconf -if
}
next reply other threads:[~2020-10-12 20:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 20:03 ahesford [this message]
2020-10-12 20:30 ` the-antz
2020-10-12 20:53 ` [PR PATCH] [Merged]: " ahesford
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25550@inbox.vuxu.org \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).