6 files changed, 0 insertions, 145 deletions
diff --git a/sys-apps/apparmor/files/apparmor-2.11.1-dynamic-link.patch b/sys-apps/apparmor/files/apparmor-2.11.1-dynamic-link.patch
deleted file mode 100644
index bde21c30..00000000
--- a/sys-apps/apparmor/files/apparmor-2.11.1-dynamic-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -87,7 +87,7 @@
- AAREOBJECT = ${AAREDIR}/libapparmor_re.a
- AAREOBJECTS = $(AAREOBJECT)
- AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS)
--AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
-+AALIB = -Wl,-Bdynamic -lapparmor -Wl,-Bdynamic -lpthread
- 
- ifdef USE_SYSTEM
-   # Using the system libapparmor so Makefile dependencies can't be used
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 239ff81f..00000000
--- 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-init b/sys-apps/apparmor/files/apparmor-init
deleted file mode 100644
index 48877e4b..00000000
--- a/sys-apps/apparmor/files/apparmor-init
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Load all configured profiles for the AppArmor security module."
-description_reload="Reload all profiles"
-
-extra_started_commands="reload"
-
-aa_action() {
-	local arg=$1
-	local return
-
-	shift
-	$*
-	return=$?
-
-	if [ ${return} -eq 0 ]; then
-		aa_log_success_msg $arg
-	else
-		aa_log_failure_msg arg
-	fi
-
-	return $return
-}
-
-aa_log_action_start() {
-	ebegin $1
-}
-
-aa_log_action_end() {
-	eend $1
-}
-
-aa_log_success_msg() {
-	einfo $1
-}
-
-aa_log_warning_msg() {
-	ewarn $1
-}
-
-aa_log_failure_msg() {
-	eerror $1
-}
-
-aa_log_skipped_msg() {
-	einfo $1
-}
-
-aa_log_daemon_msg() {
-	einfo $1
-}
-
-aa_log_end_msg() {
-	eend $1
-}
-
-. /usr/libexec/rc.apparmor.functions
-
-start() {
-	ebegin "Starting AppArmor"
-	eindent
-
-	if ! is_apparmor_loaded ; then
-		load_module
-		if [ $? -ne 0 ]; then
-			eerror "AppArmor kernel support is not present"
-			eend 1
-			return 1
-		fi
-	fi
-
-	parse_profiles load
-
-	eoutdent
-}
-
-stop() {
-	ebegin "Stopping AppArmor"
-	eindent
-	apparmor_stop
-	eoutdent
-}
-
-reload() {
-	# todo: split out clean_profiles into its own function upstream
-	# so we can do parse_profiles reload && clean_profiles
-	# and do a proper reload instead of restart
-	apparmor_restart
-}
diff --git a/sys-apps/apparmor/files/apparmor.service b/sys-apps/apparmor/files/apparmor.service
deleted file mode 100644
index 89f14fed..00000000
--- a/sys-apps/apparmor/files/apparmor.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=AppArmor profiles
-DefaultDependencies=no
-After=local-fs.target
-Before=sysinit.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/apparmor/apparmor_load.sh
-ExecStop=/usr/share/apparmor/apparmor_unload.sh
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/apparmor/files/apparmor_load.sh b/sys-apps/apparmor/files/apparmor_load.sh
deleted file mode 100644
index e6fe6b68..00000000
--- a/sys-apps/apparmor/files/apparmor_load.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -r {} +
diff --git a/sys-apps/apparmor/files/apparmor_unload.sh b/sys-apps/apparmor/files/apparmor_unload.sh
deleted file mode 100644
index 19e598bb..00000000
--- a/sys-apps/apparmor/files/apparmor_unload.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -R {} \;