[PR PATCH] runit-void: load apparmor profiles from symlinks in /etc/apparmor.d

[PR PATCH] runit-void: load apparmor profiles from symlinks in /etc/apparmor.d

[el-remph]

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

There is a new pull request by el-remph against master on the void-packages repository

https://github.com/el-remph/void-packages apparmor-load-symlinks
https://github.com/void-linux/void-packages/pull/53812

runit-void: load apparmor profiles from symlinks in /etc/apparmor.d
#### Testing the changes
- I tested the changes in this PR: **YES**

Fixes: the existing script doesn't load apparmor profiles from symlinks, so eg. if you symlink to one of the /usr/share/apparmor/extra-profiles/, that will be silently skipped

This also doesn't rely on shell whitespace splitting (ot that there should be whitespace anywhere in these filenames anyway)

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

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

From 790a4aece7b3f0f644dd966c940a875b1afc4ef7 Mon Sep 17 00:00:00 2001
From: remph <lhr@disroot.org>
Date: Tue, 24 Dec 2024 14:37:03 +0000
Subject: [PATCH] runit-void: load apparmor profiles from symlinks in
 /etc/apparmor.d

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

diff --git a/srcpkgs/runit-void/files/09-apparmor.sh b/srcpkgs/runit-void/files/09-apparmor.sh
index 1d24b4e349cd2b..e2c87a6b6225fd 100644
--- a/srcpkgs/runit-void/files/09-apparmor.sh
+++ b/srcpkgs/runit-void/files/09-apparmor.sh
@@ -18,7 +18,7 @@ if [ -n "$APPARMOR" ]; then
 	[ "$APPARMOR" = "complain" ] && AACOMPLAIN="-C"
 
 	if [ -d /etc/apparmor.d -a -x /usr/bin/apparmor_parser ]; then
-		apparmor_parser -a $AACOMPLAIN $(find /etc/apparmor.d -maxdepth 1 -type f ! -name '*.new-*_*')
+		find -L /etc/apparmor.d -maxdepth 1 -type f ! -name '*.new-*_*' -exec apparmor_parser -a $AACOMPLAIN -- {} +
 	else
 		printf '! AppArmor installation problem - ensure you have installed apparmor package\n'
 	fi
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index dc74a41785cab0..a11b567d43e2c6 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20231124
-revision=5
+revision=6
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
 maintainer="Enno Boland <gottox@voidlinux.org>"

Re: [PR REVIEW] runit-void: load apparmor profiles from symlinks in /etc/apparmor.d

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53812#discussion_r1901196143

Comment:
please rebase (revision should go to 7 because of 6067b38ec7f54d949290e5c98915dad812d097b1)

Re: [PR PATCH] [Updated] runit-void: load apparmor profiles from symlinks in /etc/apparmor.d

[el-remph]

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

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

https://github.com/el-remph/void-packages apparmor-load-symlinks
https://github.com/void-linux/void-packages/pull/53812

runit-void: load apparmor profiles from symlinks in /etc/apparmor.d
#### Testing the changes
- I tested the changes in this PR: **YES**

Fixes: the existing script doesn't load apparmor profiles from symlinks, so eg. if you symlink to one of the /usr/share/apparmor/extra-profiles/, that will be silently skipped

This also doesn't rely on shell whitespace splitting (ot that there should be whitespace anywhere in these filenames anyway)

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

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

From 509572dc829024b2be28814996d86b2e142b2eaf Mon Sep 17 00:00:00 2001
From: remph <lhr@disroot.org>
Date: Tue, 24 Dec 2024 14:37:03 +0000
Subject: [PATCH] runit-void: load apparmor profiles from symlinks in
 /etc/apparmor.d

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

diff --git a/srcpkgs/runit-void/files/09-apparmor.sh b/srcpkgs/runit-void/files/09-apparmor.sh
index 1d24b4e349cd2b..e2c87a6b6225fd 100644
--- a/srcpkgs/runit-void/files/09-apparmor.sh
+++ b/srcpkgs/runit-void/files/09-apparmor.sh
@@ -18,7 +18,7 @@ if [ -n "$APPARMOR" ]; then
 	[ "$APPARMOR" = "complain" ] && AACOMPLAIN="-C"
 
 	if [ -d /etc/apparmor.d -a -x /usr/bin/apparmor_parser ]; then
-		apparmor_parser -a $AACOMPLAIN $(find /etc/apparmor.d -maxdepth 1 -type f ! -name '*.new-*_*')
+		find -L /etc/apparmor.d -maxdepth 1 -type f ! -name '*.new-*_*' -exec apparmor_parser -a $AACOMPLAIN -- {} +
 	else
 		printf '! AppArmor installation problem - ensure you have installed apparmor package\n'
 	fi
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index a11b567d43e2c6..20625f8100fa18 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20231124
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
 maintainer="Enno Boland <gottox@voidlinux.org>"

Re: [PR REVIEW] runit-void: load apparmor profiles from symlinks in /etc/apparmor.d

[el-remph]

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

New review comment by el-remph on void-packages repository

https://github.com/void-linux/void-packages/pull/53812#discussion_r1905578842

Comment:
done