mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2025-01-18 00:48:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: cosmetic.

Browse source
This commit is contained in:
Alexandre Pujol 2023-03-29 00:24:36 +01:00
parent b43c3fe0c9
commit 78a1d2b26c
Failed to generate hash of commit
1 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
configure vendored
View file

@ -20,16 +20,16 @@ _msg() { printf ' - %s\n' "$*" >&2; }
process() { process() {
local len nprof nproc fct="$1" msg="$2" local len nprof nproc fct="$1" msg="$2"
_msg "$msg" _msg "$msg"
mapfile -t files < <(find "${ROOT:?}/apparmor.d" -type f) mapfile -t files < <(find "${ROOT:?}/apparmor.d" -type f)
len="${#files[@]}" len="${#files[@]}"
nproc=$(nproc) nproc=$(nproc)
(( nprof = len/nproc + 1 )) ((nprof = len / nproc + 1))
start=0 start=0
end=$nprof end=$nprof
for ((ii = 0 ; ii < nproc ; ii++)); do for ((ii = 0; ii < nproc; ii++)); do
$fct $start $end "${files[@]}" & $fct $start $end "${files[@]}" &
(( start = end + 1 )) ((start = end + 1))
(( end = end + nprof )) ((end = end + nprof))
done done
wait wait
} }
@ -70,37 +70,37 @@ synchronise() {
# Set the distribution specificities # Set the distribution specificities
configure() { configure() {
case "$DISTRIBUTION" in case "$DISTRIBUTION" in
arch|endeavouros|cachyos|manjarolinux) arch | endeavouros | cachyos | manjarolinux)
_msg "Configure libexec." _msg "Configure libexec."
LIBEXEC="/{usr/,}lib" LIBEXEC="/{usr/,}lib"
sed -i -e '/Debian/d' "$ROOT/apparmor.d/tunables/etc.d/apparmor.d" sed -i -e '/Debian/d' "$ROOT/apparmor.d/tunables/etc.d/apparmor.d"
;; ;;
debian|ubuntu|whonix|core) debian | ubuntu | whonix | core)
mv "$ROOT/apparmor.d/abstractions/trash.d/complete" "$ROOT/apparmor.d/abstractions/trash" mv "$ROOT/apparmor.d/abstractions/trash.d/complete" "$ROOT/apparmor.d/abstractions/trash"
case "$DISTRIBUTION" in case "$DISTRIBUTION" in
core) core)
mkdir -p $ROOT/root/usr/lib/systemd/system/systemd-udevd.service.d/ mkdir -p $ROOT/root/usr/lib/systemd/system/systemd-udevd.service.d/
cp -a dists/core/systemd-udevd.service $ROOT/root/usr/lib/systemd/system/systemd-udevd.service.d/apparmor.conf cp -a dists/core/systemd-udevd.service $ROOT/root/usr/lib/systemd/system/systemd-udevd.service.d/apparmor.conf
cp -a apparmor.d/groups/_full/systemd $ROOT/apparmor.d/systemd ;; cp -a apparmor.d/groups/_full/systemd $ROOT/apparmor.d/systemd ;;
debian|whonix) debian | whonix)
_msg "$DISTRIBUTION does not support abi 3.0 yet." _msg "$DISTRIBUTION does not support abi 3.0 yet."
find "$ROOT/apparmor.d" -type f -exec sed -e '/abi /d' -i {} \; find "$ROOT/apparmor.d" -type f -exec sed -e '/abi /d' -i {} \;
cp -a dists/debian/abstractions/* $ROOT/apparmor.d/abstractions cp -a dists/debian/abstractions/* $ROOT/apparmor.d/abstractions
cp -a dists/debian/tunables/* $ROOT/apparmor.d/tunables ;; cp -a dists/debian/tunables/* $ROOT/apparmor.d/tunables ;;
esac esac
_msg "Configure libexec." _msg "Configure libexec."
LIBEXEC="/{usr/,}libexec" LIBEXEC="/{usr/,}libexec"
sed -i -e '/Archlinux/d' "$ROOT/apparmor.d/tunables/etc.d/apparmor.d" sed -i -e '/Archlinux/d' "$ROOT/apparmor.d/tunables/etc.d/apparmor.d"
;; ;;
opensuse) opensuse)
LIBEXEC="/{usr/,}libexec" LIBEXEC="/{usr/,}libexec"
sed -i -e '/Archlinux/d' "$ROOT/apparmor.d/tunables/etc.d/apparmor.d" sed -i -e '/Archlinux/d' "$ROOT/apparmor.d/tunables/etc.d/apparmor.d"
;; ;;
*) _die "$DISTRIBUTION is not a supported distribution." ;; *) _die "$DISTRIBUTION is not a supported distribution." ;;
esac esac
} }
@ -163,7 +163,7 @@ _resolve_attachments() {
entrypoint="${entrypoint# }" entrypoint="${entrypoint# }"
# If needed nest the attachments # If needed nest the attachments
IFS=" " read -r -a attachments <<< "$entrypoint" IFS=" " read -r -a attachments <<<"$entrypoint"
if [[ "${#attachments[@]}" -ge 2 ]]; then if [[ "${#attachments[@]}" -ge 2 ]]; then
res="/{" res="/{"
for aare in "${attachments[@]}"; do for aare in "${attachments[@]}"; do
@ -181,7 +181,7 @@ _userspace() {
ii="$start" ii="$start"
while [[ $ii -le $end && $ii -lt $len ]]; do while [[ $ii -le $end && $ii -lt $len ]]; do
path="${files[$ii]}" path="${files[$ii]}"
(( ii = ii + 1 )) ((ii = ii + 1))
[[ -f "$path" ]] || continue [[ -f "$path" ]] || continue
entrypoint="$(_resolve_attachments "$path")" entrypoint="$(_resolve_attachments "$path")"
[[ -z "$entrypoint" ]] && continue [[ -z "$entrypoint" ]] && continue
@ -198,7 +198,7 @@ _complain() {
ii="$start" ii="$start"
while [[ $ii -le $end && $ii -lt $len ]]; do while [[ $ii -le $end && $ii -lt $len ]]; do
path="${files[$ii]}" path="${files[$ii]}"
(( ii = ii + 1 )) ((ii = ii + 1))
[[ -f "$path" ]] || continue [[ -f "$path" ]] || continue
mapfile -t flags < <(grep -o -m 1 'flags=(.*)' "$path" | cut -d '(' -f2 | cut -d ')' -f1) mapfile -t flags < <(grep -o -m 1 'flags=(.*)' "$path" | cut -d '(' -f2 | cut -d ')' -f1)
[[ "${flags[*]}" =~ complain ]] && continue [[ "${flags[*]}" =~ complain ]] && continue
@ -216,27 +216,27 @@ full() {
cp -a apparmor.d/groups/_full/init "$ROOT/apparmor.d/" cp -a apparmor.d/groups/_full/init "$ROOT/apparmor.d/"
cp -a apparmor.d/groups/_full/systemd "$ROOT/apparmor.d/" cp -a apparmor.d/groups/_full/systemd "$ROOT/apparmor.d/"
case "$DISTRIBUTION" in case "$DISTRIBUTION" in
arch|endeavouros|cachyos|manjarolinux) arch | endeavouros | cachyos | manjarolinux)
cp -r root/usr/lib/initcpio root/usr/lib/systemd/ "$ROOT/root/usr/lib/" cp -r root/usr/lib/initcpio root/usr/lib/systemd/ "$ROOT/root/usr/lib/"
;; ;;
debian|ubuntu|whonix|core) debian | ubuntu | whonix | core)
cp -r root/usr/share/initramfs-tools "$ROOT/root/usr/share/" cp -r root/usr/share/initramfs-tools "$ROOT/root/usr/share/"
;; ;;
*) _die "$DISTRIBUTION is not a supported distribution." ;; *) _die "$DISTRIBUTION is not a supported distribution." ;;
esac esac
} }
# Print help message # Print help message
cmd_help() { cmd_help() {
cat <<-_EOF cat <<-_EOF
./configure [options] - Configure the apparmor.d package ./configure [options] - Configure the apparmor.d package
Options: Options:
-f, --full Set AppArmor for full system policy -f, --full Set AppArmor for full system policy
-c, --complain Set complain flag on all profiles -c, --complain Set complain flag on all profiles
-h, --help Print this help message and exit -h, --help Print this help message and exit
_EOF _EOF
} }