diff options
author | Dave Hughes <davidhughes205@gmail.com> | 2021-04-29 15:53:29 -0400 |
---|---|---|
committer | Dave Hughes <davidhughes205@gmail.com> | 2021-04-29 15:53:29 -0400 |
commit | 360d9a14477e7f33a5a6924d1187b1f1adafd22c (patch) | |
tree | 19828102de1c91bd8fb9ee3c1c36f02f55535388 /sys-apps | |
parent | README: fix status badges (diff) | |
download | musl-360d9a14477e7f33a5a6924d1187b1f1adafd22c.tar.gz musl-360d9a14477e7f33a5a6924d1187b1f1adafd22c.tar.bz2 musl-360d9a14477e7f33a5a6924d1187b1f1adafd22c.zip |
sys-apps/apparmor: remove from overlay
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes <davidhughes205@gmail.com>
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/apparmor/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/apparmor/apparmor-2.13.4.ebuild | 71 | ||||
-rw-r--r-- | sys-apps/apparmor/apparmor-3.0.1.ebuild | 83 | ||||
-rw-r--r-- | sys-apps/apparmor/files/0001-Fix-linking-against-gettext-on-musl-libc.patch | 40 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-2.11.1-dynamic-link.patch | 11 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch | 25 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch | 18 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-init | 91 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor-init-1 | 88 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor.service | 14 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor_load.sh | 2 | ||||
-rw-r--r-- | sys-apps/apparmor/files/apparmor_unload.sh | 2 | ||||
-rw-r--r-- | sys-apps/apparmor/metadata.xml | 14 |
13 files changed, 0 insertions, 461 deletions
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest deleted file mode 100644 index 39b52b03..00000000 --- a/sys-apps/apparmor/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 -DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 diff --git a/sys-apps/apparmor/apparmor-2.13.4.ebuild b/sys-apps/apparmor/apparmor-2.13.4.ebuild deleted file mode 100644 index a309bc1b..00000000 --- a/sys-apps/apparmor/apparmor-2.13.4.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -MY_PV="$(ver_cut 1-2)" - -DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system" -HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" -SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc" - -RESTRICT="test" # bug 675854 - -RDEPEND="~sys-libs/libapparmor-${PV}" -DEPEND="${RDEPEND} - dev-lang/perl - sys-devel/bison - sys-devel/gettext - sys-devel/flex - doc? ( dev-tex/latex2html ) -" - -S=${WORKDIR}/apparmor-${PV}/parser - -PATCHES=( - "${FILESDIR}/${PN}-2.13.1-makefile.patch" - "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch" -) - -src_prepare() { - default - - if use elibc_musl ; then - eapply "${FILESDIR}/0001-Fix-linking-against-gettext-on-musl-libc.patch" - fi - - # remove warning about missing file that controls features - # we don't currently support - sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die -} - -src_compile() { - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages - use doc && emake pdf -} - -src_test() { - emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check -} - -src_install() { - emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install - - dodir /etc/apparmor.d/disable - - newinitd "${FILESDIR}/${PN}-init" ${PN} - systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service - - use doc && dodoc techdoc.pdf - - exeinto /usr/share/apparmor - doexe "${FILESDIR}/apparmor_load.sh" - doexe "${FILESDIR}/apparmor_unload.sh" -} diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild b/sys-apps/apparmor/apparmor-3.0.1.ebuild deleted file mode 100644 index 1be6bab9..00000000 --- a/sys-apps/apparmor/apparmor-3.0.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -MY_PV="$(ver_cut 1-2)" - -DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system" -HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" -SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="doc" - -RESTRICT="test" # bug 675854 - -RDEPEND="~sys-libs/libapparmor-${PV}" -DEPEND="${RDEPEND} - dev-lang/perl - sys-devel/bison - sys-devel/gettext - sys-devel/flex - doc? ( dev-tex/latex2html ) -" - -S=${WORKDIR}/apparmor-${PV}/parser - -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-makefile.patch" - "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch" -) - -src_prepare() { - default - - # remove warning about missing file that controls features - # we don't currently support - sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die - - # bug 634782 - sed -e "s/cpp/$(tc-getCPP) -/" \ - -i ../common/list_capabilities.sh \ - -i ../common/list_af_names.sh || die -} - -src_compile() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CPP="$(tc-getCPP) -" \ - CXX="$(tc-getCXX)" \ - USE_SYSTEM=1 \ - arch manpages - use doc && emake pdf -} - -src_test() { - emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check -} - -src_install() { - emake \ - CPP="$(tc-getCPP) -" \ - DESTDIR="${D}" \ - DISTRO="unknown" \ - USE_SYSTEM=1 \ - install - - dodir /etc/apparmor.d/disable - - newinitd "${FILESDIR}/${PN}-init-1" ${PN} - systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service - - use doc && dodoc techdoc.pdf - - exeinto /usr/share/apparmor - doexe "${FILESDIR}/apparmor_load.sh" - doexe "${FILESDIR}/apparmor_unload.sh" -} diff --git a/sys-apps/apparmor/files/0001-Fix-linking-against-gettext-on-musl-libc.patch b/sys-apps/apparmor/files/0001-Fix-linking-against-gettext-on-musl-libc.patch deleted file mode 100644 index 4180cf65..00000000 --- a/sys-apps/apparmor/files/0001-Fix-linking-against-gettext-on-musl-libc.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 183849ec988c7326bcb9bf729d087e262d121b67 Mon Sep 17 00:00:00 2001 -From: allgdante <allan.garret@gmail.com> -Date: Wed, 4 Jul 2018 16:57:19 +0200 -Subject: [PATCH 1/7] Fix linking against gettext on musl libc - -Both parser and binutils must be linked against gettext ---- - binutils/Makefile | 2 +- - parser/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/binutils/Makefile b/binutils/Makefile -index 7fb71813..52e55f70 100644 ---- a/binutils/Makefile -+++ b/binutils/Makefile -@@ -52,7 +52,7 @@ SRCS = aa_enabled.c - HDRS = - TOOLS = aa-enabled aa-exec - --AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -+AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -lintl - - ifdef USE_SYSTEM - # Using the system libapparmor so Makefile dependencies can't be used -diff --git a/parser/Makefile b/parser/Makefile -index 5d799f6a..000540a3 100644 ---- a/parser/Makefile -+++ b/parser/Makefile -@@ -90,7 +90,7 @@ AAREDIR= libapparmor_re - AAREOBJECT = ${AAREDIR}/libapparmor_re.a - AAREOBJECTS = $(AAREOBJECT) - AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS) --AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -+AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -lintl - - ifdef USE_SYSTEM - # Using the system libapparmor so Makefile dependencies can't be used --- -2.20.1 - 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-3.0.0-makefile.patch b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch deleted file mode 100644 index 9c03a446..00000000 --- a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch +++ /dev/null @@ -1,18 +0,0 @@ -* 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 - $(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 4a2af725..00000000 --- a/sys-apps/apparmor/files/apparmor-init +++ /dev/null @@ -1,91 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# 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-init-1 b/sys-apps/apparmor/files/apparmor-init-1 deleted file mode 100644 index c8b8ed93..00000000 --- a/sys-apps/apparmor/files/apparmor-init-1 +++ /dev/null @@ -1,88 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# 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 - eerror "AppArmor kernel support is not present" - eend 1 - return 1 - 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 {} \; diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml deleted file mode 100644 index 42d1e8f6..00000000 --- a/sys-apps/apparmor/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>kensington@gentoo.org</email> - </maintainer> - <maintainer type="project"> - <email>hardened@gentoo.org</email> - <name>Gentoo Hardened</name> - </maintainer> - <upstream> - <remote-id type="launchpad">apparmor</remote-id> - </upstream> -</pkgmetadata> |