diff options
Diffstat (limited to 'sys-apps/apparmor/files')
-rw-r--r-- | sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch | 25 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch | 29 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-3.0.5-makefile.patch | 18 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-init-1 (renamed from sys-apps/apparmor/files/apparmor-init) | 11 |
4 files changed, 22 insertions, 61 deletions
diff --git a/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch b/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch deleted file mode 100644 index 239ff81f5cdc..000000000000 --- a/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -28,7 +28,7 @@ - CONFDIR=/etc/apparmor - INSTALL_CONFDIR=${DESTDIR}${CONFDIR} - LOCALEDIR=/usr/share/locale --MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 aa-teardown.8 -+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 aa-teardown.8 - - YACC := bison - YFLAGS := -d -@@ -371,11 +371,9 @@ - .PHONY: install-indep - install-indep: indep - install -m 755 -d $(INSTALL_CONFDIR) -- install -m 644 subdomain.conf $(INSTALL_CONFDIR) -+ install -m 755 -d ${DESTDIR}/usr/libexec - install -m 644 parser.conf $(INSTALL_CONFDIR) -- install -m 755 -d ${DESTDIR}/var/lib/apparmor -- install -m 755 -d $(APPARMOR_BIN_PREFIX) -- install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX) -+ install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec - $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR} - $(MAKE) install_manpages DESTDIR=${DESTDIR} - diff --git a/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch b/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch deleted file mode 100644 index b09d7800deca..000000000000 --- a/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3bf11cee3eceacb7f3ec177fb676ba36f373d369 Mon Sep 17 00:00:00 2001 -From: Christian Boltz <apparmor@cboltz.de> -Date: Sun, 14 Oct 2018 18:10:46 +0200 -Subject: [PATCH] Fix syntax error in rc.apparmor.functions - -This bug was introduced in -- https://gitlab.com/apparmor/apparmor/merge_requests/230 -- commit c974dd0d071149213892f03de0869b860705bda0 (master) -- commit 9987a7ec9c0fc7fd9ac6831152dc77fb477fd04a (2.13 branch) ---- - parser/rc.apparmor.functions | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions -index 516edf11..9edded52 100644 ---- a/rc.apparmor.functions -+++ b/rc.apparmor.functions -@@ -128,7 +128,7 @@ skip_profile() { - return 2 - fi - if echo "${profile}" | egrep -q '^.+\.new-[0-9\.]+_[0-9]+$'; then -- return 2 ;; -+ return 2 - fi - - return 0 --- -2.18.1 - diff --git a/sys-apps/apparmor/files/apparmor-3.0.5-makefile.patch b/sys-apps/apparmor/files/apparmor-3.0.5-makefile.patch new file mode 100644 index 000000000000..5d4dd9c57e12 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-3.0.5-makefile.patch @@ -0,0 +1,18 @@ +* Avoid installing empty /var/lib/apparmor +* Install rc.apparmor.functions to Gentoo-appropriate location + +--- a/Makefile ++++ b/Makefile +@@ -407,10 +407,10 @@ + .PHONY: install-indep + install-indep: indep + install -m 755 -d $(INSTALL_CONFDIR) ++ install -m 755 -d ${DESTDIR}/usr/libexec + install -m 644 parser.conf $(INSTALL_CONFDIR) +- install -m 755 -d ${DESTDIR}/var/lib/apparmor + install -m 755 -d $(APPARMOR_BIN_PREFIX) +- install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX) ++ install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec + install -m 755 profile-load $(APPARMOR_BIN_PREFIX) + $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR} + diff --git a/sys-apps/apparmor/files/apparmor-init b/sys-apps/apparmor/files/apparmor-init-1 index 48877e4b6117..37e2e6e48955 100644 --- a/sys-apps/apparmor/files/apparmor-init +++ b/sys-apps/apparmor/files/apparmor-init-1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="Load all configured profiles for the AppArmor security module." @@ -63,12 +63,9 @@ start() { eindent if ! is_apparmor_loaded ; then - load_module - if [ $? -ne 0 ]; then - eerror "AppArmor kernel support is not present" - eend 1 - return 1 - fi + eerror "AppArmor kernel support is not present" + eend 1 + return 1 fi parse_profiles load |