| 1 |
commit: 728e24213ef6aabb47c60592bb07095e0b2cedf7 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 2 09:27:54 2019 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 2 09:28:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=728e2421 |
| 7 |
|
| 8 |
sys-apps/apparmor: remove 2.13.1 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.18 |
| 11 |
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/apparmor/Manifest | 1 - |
| 14 |
sys-apps/apparmor/apparmor-2.13.1-r1.ebuild | 65 ---------------------- |
| 15 |
.../apparmor/files/apparmor-2.13.1-syntax.patch | 29 ---------- |
| 16 |
3 files changed, 95 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest |
| 19 |
index f99a118d76e..696ceaa4e8e 100644 |
| 20 |
--- a/sys-apps/apparmor/Manifest |
| 21 |
+++ b/sys-apps/apparmor/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
-DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7 |
| 24 |
DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141 |
| 25 |
|
| 26 |
diff --git a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild b/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild |
| 27 |
deleted file mode 100644 |
| 28 |
index b14dc3e4420..00000000000 |
| 29 |
--- a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,65 +0,0 @@ |
| 32 |
-# Copyright 1999-2018 Gentoo Authors |
| 33 |
-# Distributed under the terms of the GNU General Public License v2 |
| 34 |
- |
| 35 |
-EAPI=7 |
| 36 |
- |
| 37 |
-inherit systemd toolchain-funcs |
| 38 |
- |
| 39 |
-MY_PV="$(ver_cut 1-2)" |
| 40 |
- |
| 41 |
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system" |
| 42 |
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" |
| 43 |
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz" |
| 44 |
- |
| 45 |
-LICENSE="GPL-2" |
| 46 |
-SLOT="0" |
| 47 |
-KEYWORDS="~amd64" |
| 48 |
-IUSE="doc" |
| 49 |
- |
| 50 |
-RDEPEND="~sys-libs/libapparmor-${PV}" |
| 51 |
-DEPEND="${RDEPEND} |
| 52 |
- dev-lang/perl |
| 53 |
- sys-devel/bison |
| 54 |
- sys-devel/flex |
| 55 |
- doc? ( dev-tex/latex2html ) |
| 56 |
-" |
| 57 |
- |
| 58 |
-S=${WORKDIR}/apparmor-${PV}/parser |
| 59 |
- |
| 60 |
-PATCHES=( |
| 61 |
- "${FILESDIR}/${PN}-2.13.1-makefile.patch" |
| 62 |
- "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch" |
| 63 |
- "${FILESDIR}/${P}-syntax.patch" |
| 64 |
-) |
| 65 |
- |
| 66 |
-src_prepare() { |
| 67 |
- default |
| 68 |
- |
| 69 |
- # remove warning about missing file that controls features |
| 70 |
- # we don't currently support |
| 71 |
- sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die |
| 72 |
-} |
| 73 |
- |
| 74 |
-src_compile() { |
| 75 |
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages |
| 76 |
- use doc && emake pdf |
| 77 |
-} |
| 78 |
- |
| 79 |
-src_test() { |
| 80 |
- emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check |
| 81 |
-} |
| 82 |
- |
| 83 |
-src_install() { |
| 84 |
- emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install |
| 85 |
- |
| 86 |
- dodir /etc/apparmor.d/disable |
| 87 |
- |
| 88 |
- newinitd "${FILESDIR}/${PN}-init" ${PN} |
| 89 |
- systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service |
| 90 |
- |
| 91 |
- use doc && dodoc techdoc.pdf |
| 92 |
- |
| 93 |
- exeinto /usr/share/apparmor |
| 94 |
- doexe "${FILESDIR}/apparmor_load.sh" |
| 95 |
- doexe "${FILESDIR}/apparmor_unload.sh" |
| 96 |
-} |
| 97 |
|
| 98 |
diff --git a/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch b/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch |
| 99 |
deleted file mode 100644 |
| 100 |
index b09d7800dec..00000000000 |
| 101 |
--- a/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch |
| 102 |
+++ /dev/null |
| 103 |
@@ -1,29 +0,0 @@ |
| 104 |
-From 3bf11cee3eceacb7f3ec177fb676ba36f373d369 Mon Sep 17 00:00:00 2001 |
| 105 |
-From: Christian Boltz <apparmor@××××××.de> |
| 106 |
-Date: Sun, 14 Oct 2018 18:10:46 +0200 |
| 107 |
-Subject: [PATCH] Fix syntax error in rc.apparmor.functions |
| 108 |
- |
| 109 |
-This bug was introduced in |
| 110 |
-- https://gitlab.com/apparmor/apparmor/merge_requests/230 |
| 111 |
-- commit c974dd0d071149213892f03de0869b860705bda0 (master) |
| 112 |
-- commit 9987a7ec9c0fc7fd9ac6831152dc77fb477fd04a (2.13 branch) |
| 113 |
---- |
| 114 |
- parser/rc.apparmor.functions | 2 +- |
| 115 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 116 |
- |
| 117 |
-diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions |
| 118 |
-index 516edf11..9edded52 100644 |
| 119 |
---- a/rc.apparmor.functions |
| 120 |
-+++ b/rc.apparmor.functions |
| 121 |
-@@ -128,7 +128,7 @@ skip_profile() { |
| 122 |
- return 2 |
| 123 |
- fi |
| 124 |
- if echo "${profile}" | egrep -q '^.+\.new-[0-9\.]+_[0-9]+$'; then |
| 125 |
-- return 2 ;; |
| 126 |
-+ return 2 |
| 127 |
- fi |
| 128 |
- |
| 129 |
- return 0 |
| 130 |
--- |
| 131 |
-2.18.1 |
| 132 |
- |
Archives