Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/
Date: Thu, 07 Dec 2017 09:49:31
Message-Id: 1512640141.01417d76965fc9cb35171e72694562c71da537c5.kensington@gentoo
1 commit: 01417d76965fc9cb35171e72694562c71da537c5
2 Author: Reuben D'Netto <rdnetto <AT> gmail <DOT> com>
3 AuthorDate: Wed Dec 6 11:12:46 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 7 09:49:01 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01417d76
7
8 sys-apps/apparmor: Added systemd unit.
9
10 Closes: https://bugs.gentoo.org/555388
11 Closes: https://github.com/gentoo/gentoo/pull/6466
12
13 sys-apps/apparmor/Manifest | 2 +-
14 sys-apps/apparmor/apparmor-2.11.1-r2.ebuild | 64 +++++++++++++++++++++++++++++
15 sys-apps/apparmor/files/apparmor.service | 14 +++++++
16 sys-apps/apparmor/files/apparmor_load.sh | 2 +
17 sys-apps/apparmor/files/apparmor_unload.sh | 2 +
18 5 files changed, 83 insertions(+), 1 deletion(-)
19
20 diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
21 index a2e9f8fdb80..fa2e8344639 100644
22 --- a/sys-apps/apparmor/Manifest
23 +++ b/sys-apps/apparmor/Manifest
24 @@ -1 +1 @@
25 -DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e
26 +DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
27
28 diff --git a/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild b/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
29 new file mode 100644
30 index 00000000000..1d78904b577
31 --- /dev/null
32 +++ b/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
33 @@ -0,0 +1,64 @@
34 +# Copyright 1999-2017 Gentoo Foundation
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
38 +
39 +inherit systemd toolchain-funcs versionator
40 +
41 +MY_PV="$(get_version_component_range 1-2)"
42 +
43 +DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
44 +HOMEPAGE="http://apparmor.net/"
45 +SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.gz"
46 +
47 +LICENSE="GPL-2"
48 +SLOT="0"
49 +KEYWORDS="~amd64"
50 +IUSE="doc"
51 +
52 +RDEPEND="~sys-libs/libapparmor-${PV}"
53 +DEPEND="${RDEPEND}
54 + dev-lang/perl
55 + sys-devel/bison
56 + sys-devel/flex
57 + doc? ( dev-tex/latex2html )
58 +"
59 +
60 +S=${WORKDIR}/apparmor-${PV}/parser
61 +
62 +PATCHES=(
63 + "${FILESDIR}/${PN}-2.10-makefile.patch"
64 + "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
65 +)
66 +
67 +src_prepare() {
68 + default
69 +
70 + # remove warning about missing file that controls features
71 + # we don't currently support
72 + sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
73 +}
74 +
75 +src_compile() {
76 + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
77 + use doc && emake pdf
78 +}
79 +
80 +src_test() {
81 + emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
82 +}
83 +
84 +src_install() {
85 + emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
86 +
87 + dodir /etc/apparmor.d/disable
88 +
89 + newinitd "${FILESDIR}/${PN}-init" ${PN}
90 + systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
91 +
92 + use doc && dodoc techdoc.pdf
93 +
94 + exeinto /usr/share/apparmor
95 + doexe "${FILESDIR}/apparmor_load.sh"
96 + doexe "${FILESDIR}/apparmor_unload.sh"
97 +}
98
99 diff --git a/sys-apps/apparmor/files/apparmor.service b/sys-apps/apparmor/files/apparmor.service
100 new file mode 100644
101 index 00000000000..89f14fed4b7
102 --- /dev/null
103 +++ b/sys-apps/apparmor/files/apparmor.service
104 @@ -0,0 +1,14 @@
105 +[Unit]
106 +Description=AppArmor profiles
107 +DefaultDependencies=no
108 +After=local-fs.target
109 +Before=sysinit.target
110 +
111 +[Service]
112 +Type=oneshot
113 +ExecStart=/usr/share/apparmor/apparmor_load.sh
114 +ExecStop=/usr/share/apparmor/apparmor_unload.sh
115 +RemainAfterExit=yes
116 +
117 +[Install]
118 +WantedBy=multi-user.target
119
120 diff --git a/sys-apps/apparmor/files/apparmor_load.sh b/sys-apps/apparmor/files/apparmor_load.sh
121 new file mode 100755
122 index 00000000000..e6fe6b68431
123 --- /dev/null
124 +++ b/sys-apps/apparmor/files/apparmor_load.sh
125 @@ -0,0 +1,2 @@
126 +#!/bin/sh
127 +find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -r {} +
128
129 diff --git a/sys-apps/apparmor/files/apparmor_unload.sh b/sys-apps/apparmor/files/apparmor_unload.sh
130 new file mode 100755
131 index 00000000000..19e598bb84c
132 --- /dev/null
133 +++ b/sys-apps/apparmor/files/apparmor_unload.sh
134 @@ -0,0 +1,2 @@
135 +#!/bin/sh
136 +find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -R {} \;