commit: 728e24213ef6aabb47c60592bb07095e0b2cedf7 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Mon Dec 2 09:27:54 2019 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Mon Dec 2 09:28:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=728e2421
sys-apps/apparmor: remove 2.13.1 Package-Manager: Portage-2.3.76, Repoman-2.3.18 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> sys-apps/apparmor/Manifest | 1 - sys-apps/apparmor/apparmor-2.13.1-r1.ebuild | 65 ---------------------- .../apparmor/files/apparmor-2.13.1-syntax.patch | 29 ---------- 3 files changed, 95 deletions(-) diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest index f99a118d76e..696ceaa4e8e 100644 --- a/sys-apps/apparmor/Manifest +++ b/sys-apps/apparmor/Manifest @@ -1,2 +1 @@ -DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141 diff --git a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild b/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild deleted file mode 100644 index b14dc3e4420..00000000000 --- a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2018 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" - -RDEPEND="~sys-libs/libapparmor-${PV}" -DEPEND="${RDEPEND} - dev-lang/perl - sys-devel/bison - 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" - "${FILESDIR}/${P}-syntax.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 -} - -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/files/apparmor-2.13.1-syntax.patch b/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch deleted file mode 100644 index b09d7800dec..00000000000 --- 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 <appar...@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 -
