Check if all profiles and abstractions contain abi/4.0

... and add abi/4.0 where it was missing
This commit is contained in:
Christian Boltz 2024-10-06 11:56:58 +02:00
parent bb460ba467
commit 8c80c56252
Failed to generate hash of commit
11 changed files with 24 additions and 2 deletions

View file

@ -154,11 +154,12 @@ check-logprof: test-dependencies
.PHONY: check-abstractions.d
check-abstractions.d:
@echo "*** Checking if all abstractions (with a few exceptions) contain 'include if exists <abstractions/*.d>'"
@echo "*** Checking if all abstractions (with a few exceptions) contain 'include if exists <abstractions/*.d>' and 'abi <abi/4.0>,'"
$(Q)for file in $$(find ${ABSTRACTIONS_SOURCE} ${EXTRAS_ABSTRACTIONS_SOURCE} -maxdepth 1 -type f) ; do \
case "$${file}" in */ubuntu-browsers | */ubuntu-helpers) continue ;; esac ; \
include="include if exists <abstractions/$$(basename $${file}).d>" ; \
grep -q "^ $${include}\$$" $${file} || { echo "$${file} does not contain '$${include}'"; exit 1; } ; \
grep -q "^ *abi <abi/4.0>," $${file} || { echo "$${file} does not contain 'abi <abi/4.0>,'"; exit 1; } ; \
done
.PHONY: check-tunables.d
@ -172,9 +173,10 @@ check-tunables.d:
.PHONY: check-local
check-local:
@echo "*** Checking if all profiles contain 'include if exists <local/*>'"
@echo "*** Checking if all profiles contain 'include if exists <local/*>' and 'abi <abi/4.0>,'"
$(Q)for file in $$(find ${PROFILES_SOURCE} ${EXTRAS_SOURCE} -maxdepth 1 -type f) ; do \
case "$${file}" in */README) continue ;; esac ; \
include="include if exists <local/$$(basename $${file})>" ; \
grep -q "^ *$${include}\$$" $${file} || { echo "$${file} does not contain '$${include}'"; exit 1; } ; \
grep -q "^ *abi <abi/4.0>," $${file} || { echo "$${file} does not contain 'abi <abi/4.0>,'"; exit 1; } ; \
done

View file

@ -10,6 +10,8 @@
#
# ------------------------------------------------------------------
abi <abi/4.0>,
# Note: executing groff and nroff themself is not included in this abstraction
# so that you can choose to ix, Px or Cx them in your profile

View file

@ -1,3 +1,5 @@
abi <abi/4.0>,
profile snap_browsers {
include if exists <abstractions/snap_browsers.d>
include <abstractions/base>

View file

@ -2,6 +2,8 @@
# LOGPROF-SUGGEST: no
# Author: Daniel Richard G. <skunk@iSKUNK.ORG>
abi <abi/4.0>,
include <abstractions/base>
include <abstractions/freedesktop.org>
include <abstractions/nameservice>

View file

@ -9,6 +9,8 @@
# ------------------------------------------------------------------
# vim: ft=apparmor
abi <abi/4.0>,
include <tunables/global>
profile dovecot-director /usr/lib*/dovecot/director flags=(attach_disconnected) {

View file

@ -9,6 +9,8 @@
# ------------------------------------------------------------------
# vim: ft=apparmor
abi <abi/4.0>,
include <tunables/global>
profile dovecot-doveadm-server /usr/lib*/dovecot/doveadm-server flags=(attach_disconnected) {

View file

@ -12,6 +12,8 @@
# vim: ft=apparmor
# for https://wiki.dovecot.org/Replication
abi <abi/4.0>,
include <tunables/dovecot>
include <tunables/global>

View file

@ -8,6 +8,8 @@
#
# ------------------------------------------------------------------
abi <abi/4.0>,
include <tunables/global>
profile pyzorsocket /usr/bin/pyzorsocket {

View file

@ -8,6 +8,8 @@
#
# ------------------------------------------------------------------
abi <abi/4.0>,
include <tunables/global>
profile razorsocket /usr/bin/razorsocket {

View file

@ -8,6 +8,8 @@
#
# ------------------------------------------------------------------
abi <abi/4.0>,
include <tunables/global>
profile clamd /usr/sbin/clamd {

View file

@ -8,6 +8,8 @@
#
# ------------------------------------------------------------------
abi <abi/4.0>,
include <tunables/global>
profile haproxy /usr/sbin/haproxy {