Re: [PR PATCH] [Updated] apparmor: load profiles in parallel

[thypon <thypon@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

There is an updated pull request by thypon against master on the void-packages repository

https://github.com/thypon/void-packages apparmor-parallel
https://github.com/void-linux/void-packages/pull/28766

apparmor: load profiles in parallel
Just a quick mod for parallelizing apparmor profiles on load.

Cc: @Gottox @ericonr @CameronNemo 

A patch file from https://github.com/void-linux/void-packages/pull/28766.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apparmor-parallel-28766.patch --]
[-- Type: text/x-diff, Size: 1695 bytes --]

From d5d52ad5f52e807cc424e06cc4bef0089011fdd1 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 14 Feb 2021 21:39:38 +0000
Subject: [PATCH] apparmor: load profiles in parallel

---
 srcpkgs/apparmor/template               |  2 +-
 srcpkgs/runit-void/files/09-apparmor.sh | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 6e7300cff1e..dfbd3ef472f 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
 version=3.0.1
-revision=2
+revision=3
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
diff --git a/srcpkgs/runit-void/files/09-apparmor.sh b/srcpkgs/runit-void/files/09-apparmor.sh
index 7d8d09ee80f..5951c35e5ea 100644
--- a/srcpkgs/runit-void/files/09-apparmor.sh
+++ b/srcpkgs/runit-void/files/09-apparmor.sh
@@ -18,15 +18,9 @@ if [ -n "$APPARMOR" ]; then
 	[ "$APPARMOR" = "complain" ] && AACOMPLAIN="-C"
 
 	if [ -d /etc/apparmor.d -a -x /usr/bin/apparmor_parser ]; then
-		for profile in /etc/apparmor.d/*; do
-		case "$profile" in
-			*.new-*_*) continue ;;
-		esac
-		if [ -f "$profile" ]; then
-			printf '* Load profile %s: %s\n' "($APPARMOR)" "$profile"
-			apparmor_parser -a $AACOMPLAIN "$profile"
-		fi
-		done
+		find /etc/apparmor.d -maxdepth 1 -type f ! -name '*.new-*_*' |\
+			xargs -d"\n" -I{} --max-procs="$(nproc)" \
+				sh -c "printf '* Load profile %s: %s\n' '($APPARMOR)' '{}'; apparmor_parser -a $AACOMPLAIN '{}'"
 	else
 		printf '! AppArmor installation problem - ensure you have installed apparmor package\n'
 	fi