1 |
commit: 360d9a14477e7f33a5a6924d1187b1f1adafd22c |
2 |
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Apr 29 19:53:29 2021 +0000 |
4 |
Commit: Dave Hughes <davidhughes205 <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Apr 29 19:53:29 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=360d9a14 |
7 |
|
8 |
sys-apps/apparmor: remove from overlay |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com> |
12 |
|
13 |
sys-apps/apparmor/Manifest | 2 - |
14 |
sys-apps/apparmor/apparmor-2.13.4.ebuild | 71 ----------------- |
15 |
sys-apps/apparmor/apparmor-3.0.1.ebuild | 83 -------------------- |
16 |
...-Fix-linking-against-gettext-on-musl-libc.patch | 40 ---------- |
17 |
.../files/apparmor-2.11.1-dynamic-link.patch | 11 --- |
18 |
.../apparmor/files/apparmor-2.13.1-makefile.patch | 25 ------ |
19 |
.../apparmor/files/apparmor-3.0.0-makefile.patch | 18 ----- |
20 |
sys-apps/apparmor/files/apparmor-init | 91 ---------------------- |
21 |
sys-apps/apparmor/files/apparmor-init-1 | 88 --------------------- |
22 |
sys-apps/apparmor/files/apparmor.service | 14 ---- |
23 |
sys-apps/apparmor/files/apparmor_load.sh | 2 - |
24 |
sys-apps/apparmor/files/apparmor_unload.sh | 2 - |
25 |
sys-apps/apparmor/metadata.xml | 14 ---- |
26 |
13 files changed, 461 deletions(-) |
27 |
|
28 |
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest |
29 |
deleted file mode 100644 |
30 |
index 39b52b0..0000000 |
31 |
--- a/sys-apps/apparmor/Manifest |
32 |
+++ /dev/null |
33 |
@@ -1,2 +0,0 @@ |
34 |
-DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 |
35 |
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 |
36 |
|
37 |
diff --git a/sys-apps/apparmor/apparmor-2.13.4.ebuild b/sys-apps/apparmor/apparmor-2.13.4.ebuild |
38 |
deleted file mode 100644 |
39 |
index a309bc1..0000000 |
40 |
--- a/sys-apps/apparmor/apparmor-2.13.4.ebuild |
41 |
+++ /dev/null |
42 |
@@ -1,71 +0,0 @@ |
43 |
-# Copyright 1999-2021 Gentoo Authors |
44 |
-# Distributed under the terms of the GNU General Public License v2 |
45 |
- |
46 |
-EAPI=7 |
47 |
- |
48 |
-inherit systemd toolchain-funcs |
49 |
- |
50 |
-MY_PV="$(ver_cut 1-2)" |
51 |
- |
52 |
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system" |
53 |
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" |
54 |
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz" |
55 |
- |
56 |
-LICENSE="GPL-2" |
57 |
-SLOT="0" |
58 |
-KEYWORDS="~amd64" |
59 |
-IUSE="doc" |
60 |
- |
61 |
-RESTRICT="test" # bug 675854 |
62 |
- |
63 |
-RDEPEND="~sys-libs/libapparmor-${PV}" |
64 |
-DEPEND="${RDEPEND} |
65 |
- dev-lang/perl |
66 |
- sys-devel/bison |
67 |
- sys-devel/gettext |
68 |
- sys-devel/flex |
69 |
- doc? ( dev-tex/latex2html ) |
70 |
-" |
71 |
- |
72 |
-S=${WORKDIR}/apparmor-${PV}/parser |
73 |
- |
74 |
-PATCHES=( |
75 |
- "${FILESDIR}/${PN}-2.13.1-makefile.patch" |
76 |
- "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch" |
77 |
-) |
78 |
- |
79 |
-src_prepare() { |
80 |
- default |
81 |
- |
82 |
- if use elibc_musl ; then |
83 |
- eapply "${FILESDIR}/0001-Fix-linking-against-gettext-on-musl-libc.patch" |
84 |
- fi |
85 |
- |
86 |
- # remove warning about missing file that controls features |
87 |
- # we don't currently support |
88 |
- sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die |
89 |
-} |
90 |
- |
91 |
-src_compile() { |
92 |
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages |
93 |
- use doc && emake pdf |
94 |
-} |
95 |
- |
96 |
-src_test() { |
97 |
- emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check |
98 |
-} |
99 |
- |
100 |
-src_install() { |
101 |
- emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install |
102 |
- |
103 |
- dodir /etc/apparmor.d/disable |
104 |
- |
105 |
- newinitd "${FILESDIR}/${PN}-init" ${PN} |
106 |
- systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service |
107 |
- |
108 |
- use doc && dodoc techdoc.pdf |
109 |
- |
110 |
- exeinto /usr/share/apparmor |
111 |
- doexe "${FILESDIR}/apparmor_load.sh" |
112 |
- doexe "${FILESDIR}/apparmor_unload.sh" |
113 |
-} |
114 |
|
115 |
diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild b/sys-apps/apparmor/apparmor-3.0.1.ebuild |
116 |
deleted file mode 100644 |
117 |
index 1be6bab..0000000 |
118 |
--- a/sys-apps/apparmor/apparmor-3.0.1.ebuild |
119 |
+++ /dev/null |
120 |
@@ -1,83 +0,0 @@ |
121 |
-# Copyright 1999-2021 Gentoo Authors |
122 |
-# Distributed under the terms of the GNU General Public License v2 |
123 |
- |
124 |
-EAPI=7 |
125 |
- |
126 |
-inherit systemd toolchain-funcs |
127 |
- |
128 |
-MY_PV="$(ver_cut 1-2)" |
129 |
- |
130 |
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system" |
131 |
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" |
132 |
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz" |
133 |
- |
134 |
-LICENSE="GPL-2" |
135 |
-SLOT="0" |
136 |
-KEYWORDS="~amd64 ~arm64" |
137 |
-IUSE="doc" |
138 |
- |
139 |
-RESTRICT="test" # bug 675854 |
140 |
- |
141 |
-RDEPEND="~sys-libs/libapparmor-${PV}" |
142 |
-DEPEND="${RDEPEND} |
143 |
- dev-lang/perl |
144 |
- sys-devel/bison |
145 |
- sys-devel/gettext |
146 |
- sys-devel/flex |
147 |
- doc? ( dev-tex/latex2html ) |
148 |
-" |
149 |
- |
150 |
-S=${WORKDIR}/apparmor-${PV}/parser |
151 |
- |
152 |
-PATCHES=( |
153 |
- "${FILESDIR}/${PN}-3.0.0-makefile.patch" |
154 |
- "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch" |
155 |
-) |
156 |
- |
157 |
-src_prepare() { |
158 |
- default |
159 |
- |
160 |
- # remove warning about missing file that controls features |
161 |
- # we don't currently support |
162 |
- sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die |
163 |
- |
164 |
- # bug 634782 |
165 |
- sed -e "s/cpp/$(tc-getCPP) -/" \ |
166 |
- -i ../common/list_capabilities.sh \ |
167 |
- -i ../common/list_af_names.sh || die |
168 |
-} |
169 |
- |
170 |
-src_compile() { |
171 |
- emake \ |
172 |
- AR="$(tc-getAR)" \ |
173 |
- CC="$(tc-getCC)" \ |
174 |
- CPP="$(tc-getCPP) -" \ |
175 |
- CXX="$(tc-getCXX)" \ |
176 |
- USE_SYSTEM=1 \ |
177 |
- arch manpages |
178 |
- use doc && emake pdf |
179 |
-} |
180 |
- |
181 |
-src_test() { |
182 |
- emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check |
183 |
-} |
184 |
- |
185 |
-src_install() { |
186 |
- emake \ |
187 |
- CPP="$(tc-getCPP) -" \ |
188 |
- DESTDIR="${D}" \ |
189 |
- DISTRO="unknown" \ |
190 |
- USE_SYSTEM=1 \ |
191 |
- install |
192 |
- |
193 |
- dodir /etc/apparmor.d/disable |
194 |
- |
195 |
- newinitd "${FILESDIR}/${PN}-init-1" ${PN} |
196 |
- systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service |
197 |
- |
198 |
- use doc && dodoc techdoc.pdf |
199 |
- |
200 |
- exeinto /usr/share/apparmor |
201 |
- doexe "${FILESDIR}/apparmor_load.sh" |
202 |
- doexe "${FILESDIR}/apparmor_unload.sh" |
203 |
-} |
204 |
|
205 |
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 |
206 |
deleted file mode 100644 |
207 |
index 4180cf6..0000000 |
208 |
--- a/sys-apps/apparmor/files/0001-Fix-linking-against-gettext-on-musl-libc.patch |
209 |
+++ /dev/null |
210 |
@@ -1,40 +0,0 @@ |
211 |
-From 183849ec988c7326bcb9bf729d087e262d121b67 Mon Sep 17 00:00:00 2001 |
212 |
-From: allgdante <allan.garret@×××××.com> |
213 |
-Date: Wed, 4 Jul 2018 16:57:19 +0200 |
214 |
-Subject: [PATCH 1/7] Fix linking against gettext on musl libc |
215 |
- |
216 |
-Both parser and binutils must be linked against gettext |
217 |
---- |
218 |
- binutils/Makefile | 2 +- |
219 |
- parser/Makefile | 2 +- |
220 |
- 2 files changed, 2 insertions(+), 2 deletions(-) |
221 |
- |
222 |
-diff --git a/binutils/Makefile b/binutils/Makefile |
223 |
-index 7fb71813..52e55f70 100644 |
224 |
---- a/binutils/Makefile |
225 |
-+++ b/binutils/Makefile |
226 |
-@@ -52,7 +52,7 @@ SRCS = aa_enabled.c |
227 |
- HDRS = |
228 |
- TOOLS = aa-enabled aa-exec |
229 |
- |
230 |
--AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread |
231 |
-+AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -lintl |
232 |
- |
233 |
- ifdef USE_SYSTEM |
234 |
- # Using the system libapparmor so Makefile dependencies can't be used |
235 |
-diff --git a/parser/Makefile b/parser/Makefile |
236 |
-index 5d799f6a..000540a3 100644 |
237 |
---- a/parser/Makefile |
238 |
-+++ b/parser/Makefile |
239 |
-@@ -90,7 +90,7 @@ AAREDIR= libapparmor_re |
240 |
- AAREOBJECT = ${AAREDIR}/libapparmor_re.a |
241 |
- AAREOBJECTS = $(AAREOBJECT) |
242 |
- AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS) |
243 |
--AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread |
244 |
-+AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -lintl |
245 |
- |
246 |
- ifdef USE_SYSTEM |
247 |
- # Using the system libapparmor so Makefile dependencies can't be used |
248 |
--- |
249 |
-2.20.1 |
250 |
- |
251 |
|
252 |
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 |
253 |
deleted file mode 100644 |
254 |
index bde21c3..0000000 |
255 |
--- a/sys-apps/apparmor/files/apparmor-2.11.1-dynamic-link.patch |
256 |
+++ /dev/null |
257 |
@@ -1,11 +0,0 @@ |
258 |
---- a/Makefile |
259 |
-+++ b/Makefile |
260 |
-@@ -87,7 +87,7 @@ |
261 |
- AAREOBJECT = ${AAREDIR}/libapparmor_re.a |
262 |
- AAREOBJECTS = $(AAREOBJECT) |
263 |
- AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS) |
264 |
--AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread |
265 |
-+AALIB = -Wl,-Bdynamic -lapparmor -Wl,-Bdynamic -lpthread |
266 |
- |
267 |
- ifdef USE_SYSTEM |
268 |
- # Using the system libapparmor so Makefile dependencies can't be used |
269 |
|
270 |
diff --git a/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch b/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch |
271 |
deleted file mode 100644 |
272 |
index 239ff81..0000000 |
273 |
--- a/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch |
274 |
+++ /dev/null |
275 |
@@ -1,25 +0,0 @@ |
276 |
---- a/Makefile |
277 |
-+++ b/Makefile |
278 |
-@@ -28,7 +28,7 @@ |
279 |
- CONFDIR=/etc/apparmor |
280 |
- INSTALL_CONFDIR=${DESTDIR}${CONFDIR} |
281 |
- LOCALEDIR=/usr/share/locale |
282 |
--MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 aa-teardown.8 |
283 |
-+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 aa-teardown.8 |
284 |
- |
285 |
- YACC := bison |
286 |
- YFLAGS := -d |
287 |
-@@ -371,11 +371,9 @@ |
288 |
- .PHONY: install-indep |
289 |
- install-indep: indep |
290 |
- install -m 755 -d $(INSTALL_CONFDIR) |
291 |
-- install -m 644 subdomain.conf $(INSTALL_CONFDIR) |
292 |
-+ install -m 755 -d ${DESTDIR}/usr/libexec |
293 |
- install -m 644 parser.conf $(INSTALL_CONFDIR) |
294 |
-- install -m 755 -d ${DESTDIR}/var/lib/apparmor |
295 |
-- install -m 755 -d $(APPARMOR_BIN_PREFIX) |
296 |
-- install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX) |
297 |
-+ install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec |
298 |
- $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR} |
299 |
- $(MAKE) install_manpages DESTDIR=${DESTDIR} |
300 |
- |
301 |
|
302 |
diff --git a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch |
303 |
deleted file mode 100644 |
304 |
index 9c03a44..0000000 |
305 |
--- a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch |
306 |
+++ /dev/null |
307 |
@@ -1,18 +0,0 @@ |
308 |
-* Avoid installing empty /var/lib/apparmor |
309 |
-* Install rc.apparmor.functions to Gentoo-appropriate location |
310 |
- |
311 |
---- a/Makefile |
312 |
-+++ b/Makefile |
313 |
-@@ -407,10 +407,10 @@ |
314 |
- .PHONY: install-indep |
315 |
- install-indep: indep |
316 |
- install -m 755 -d $(INSTALL_CONFDIR) |
317 |
-+ install -m 755 -d ${DESTDIR}/usr/libexec |
318 |
- install -m 644 parser.conf $(INSTALL_CONFDIR) |
319 |
-- install -m 755 -d ${DESTDIR}/var/lib/apparmor |
320 |
- install -m 755 -d $(APPARMOR_BIN_PREFIX) |
321 |
-- install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX) |
322 |
-+ install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec |
323 |
- $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR} |
324 |
- $(MAKE) install_manpages DESTDIR=${DESTDIR} |
325 |
- |
326 |
|
327 |
diff --git a/sys-apps/apparmor/files/apparmor-init b/sys-apps/apparmor/files/apparmor-init |
328 |
deleted file mode 100644 |
329 |
index 4a2af72..0000000 |
330 |
--- a/sys-apps/apparmor/files/apparmor-init |
331 |
+++ /dev/null |
332 |
@@ -1,91 +0,0 @@ |
333 |
-#!/sbin/openrc-run |
334 |
-# Copyright 1999-2021 Gentoo Authors |
335 |
-# Distributed under the terms of the GNU General Public License v2 |
336 |
- |
337 |
-description="Load all configured profiles for the AppArmor security module." |
338 |
-description_reload="Reload all profiles" |
339 |
- |
340 |
-extra_started_commands="reload" |
341 |
- |
342 |
-aa_action() { |
343 |
- local arg=$1 |
344 |
- local return |
345 |
- |
346 |
- shift |
347 |
- $* |
348 |
- return=$? |
349 |
- |
350 |
- if [ ${return} -eq 0 ]; then |
351 |
- aa_log_success_msg $arg |
352 |
- else |
353 |
- aa_log_failure_msg arg |
354 |
- fi |
355 |
- |
356 |
- return $return |
357 |
-} |
358 |
- |
359 |
-aa_log_action_start() { |
360 |
- ebegin $1 |
361 |
-} |
362 |
- |
363 |
-aa_log_action_end() { |
364 |
- eend $1 |
365 |
-} |
366 |
- |
367 |
-aa_log_success_msg() { |
368 |
- einfo $1 |
369 |
-} |
370 |
- |
371 |
-aa_log_warning_msg() { |
372 |
- ewarn $1 |
373 |
-} |
374 |
- |
375 |
-aa_log_failure_msg() { |
376 |
- eerror $1 |
377 |
-} |
378 |
- |
379 |
-aa_log_skipped_msg() { |
380 |
- einfo $1 |
381 |
-} |
382 |
- |
383 |
-aa_log_daemon_msg() { |
384 |
- einfo $1 |
385 |
-} |
386 |
- |
387 |
-aa_log_end_msg() { |
388 |
- eend $1 |
389 |
-} |
390 |
- |
391 |
-. /usr/libexec/rc.apparmor.functions |
392 |
- |
393 |
-start() { |
394 |
- ebegin "Starting AppArmor" |
395 |
- eindent |
396 |
- |
397 |
- if ! is_apparmor_loaded ; then |
398 |
- load_module |
399 |
- if [ $? -ne 0 ]; then |
400 |
- eerror "AppArmor kernel support is not present" |
401 |
- eend 1 |
402 |
- return 1 |
403 |
- fi |
404 |
- fi |
405 |
- |
406 |
- parse_profiles load |
407 |
- |
408 |
- eoutdent |
409 |
-} |
410 |
- |
411 |
-stop() { |
412 |
- ebegin "Stopping AppArmor" |
413 |
- eindent |
414 |
- apparmor_stop |
415 |
- eoutdent |
416 |
-} |
417 |
- |
418 |
-reload() { |
419 |
- # todo: split out clean_profiles into its own function upstream |
420 |
- # so we can do parse_profiles reload && clean_profiles |
421 |
- # and do a proper reload instead of restart |
422 |
- apparmor_restart |
423 |
-} |
424 |
|
425 |
diff --git a/sys-apps/apparmor/files/apparmor-init-1 b/sys-apps/apparmor/files/apparmor-init-1 |
426 |
deleted file mode 100644 |
427 |
index c8b8ed9..0000000 |
428 |
--- a/sys-apps/apparmor/files/apparmor-init-1 |
429 |
+++ /dev/null |
430 |
@@ -1,88 +0,0 @@ |
431 |
-#!/sbin/openrc-run |
432 |
-# Copyright 1999-2021 Gentoo Authors |
433 |
-# Distributed under the terms of the GNU General Public License v2 |
434 |
- |
435 |
-description="Load all configured profiles for the AppArmor security module." |
436 |
-description_reload="Reload all profiles" |
437 |
- |
438 |
-extra_started_commands="reload" |
439 |
- |
440 |
-aa_action() { |
441 |
- local arg=$1 |
442 |
- local return |
443 |
- |
444 |
- shift |
445 |
- $* |
446 |
- return=$? |
447 |
- |
448 |
- if [ ${return} -eq 0 ]; then |
449 |
- aa_log_success_msg $arg |
450 |
- else |
451 |
- aa_log_failure_msg arg |
452 |
- fi |
453 |
- |
454 |
- return $return |
455 |
-} |
456 |
- |
457 |
-aa_log_action_start() { |
458 |
- ebegin $1 |
459 |
-} |
460 |
- |
461 |
-aa_log_action_end() { |
462 |
- eend $1 |
463 |
-} |
464 |
- |
465 |
-aa_log_success_msg() { |
466 |
- einfo $1 |
467 |
-} |
468 |
- |
469 |
-aa_log_warning_msg() { |
470 |
- ewarn $1 |
471 |
-} |
472 |
- |
473 |
-aa_log_failure_msg() { |
474 |
- eerror $1 |
475 |
-} |
476 |
- |
477 |
-aa_log_skipped_msg() { |
478 |
- einfo $1 |
479 |
-} |
480 |
- |
481 |
-aa_log_daemon_msg() { |
482 |
- einfo $1 |
483 |
-} |
484 |
- |
485 |
-aa_log_end_msg() { |
486 |
- eend $1 |
487 |
-} |
488 |
- |
489 |
-. /usr/libexec/rc.apparmor.functions |
490 |
- |
491 |
-start() { |
492 |
- ebegin "Starting AppArmor" |
493 |
- eindent |
494 |
- |
495 |
- if ! is_apparmor_loaded ; then |
496 |
- eerror "AppArmor kernel support is not present" |
497 |
- eend 1 |
498 |
- return 1 |
499 |
- fi |
500 |
- |
501 |
- parse_profiles load |
502 |
- |
503 |
- eoutdent |
504 |
-} |
505 |
- |
506 |
-stop() { |
507 |
- ebegin "Stopping AppArmor" |
508 |
- eindent |
509 |
- apparmor_stop |
510 |
- eoutdent |
511 |
-} |
512 |
- |
513 |
-reload() { |
514 |
- # todo: split out clean_profiles into its own function upstream |
515 |
- # so we can do parse_profiles reload && clean_profiles |
516 |
- # and do a proper reload instead of restart |
517 |
- apparmor_restart |
518 |
-} |
519 |
|
520 |
diff --git a/sys-apps/apparmor/files/apparmor.service b/sys-apps/apparmor/files/apparmor.service |
521 |
deleted file mode 100644 |
522 |
index 89f14fe..0000000 |
523 |
--- a/sys-apps/apparmor/files/apparmor.service |
524 |
+++ /dev/null |
525 |
@@ -1,14 +0,0 @@ |
526 |
-[Unit] |
527 |
-Description=AppArmor profiles |
528 |
-DefaultDependencies=no |
529 |
-After=local-fs.target |
530 |
-Before=sysinit.target |
531 |
- |
532 |
-[Service] |
533 |
-Type=oneshot |
534 |
-ExecStart=/usr/share/apparmor/apparmor_load.sh |
535 |
-ExecStop=/usr/share/apparmor/apparmor_unload.sh |
536 |
-RemainAfterExit=yes |
537 |
- |
538 |
-[Install] |
539 |
-WantedBy=multi-user.target |
540 |
|
541 |
diff --git a/sys-apps/apparmor/files/apparmor_load.sh b/sys-apps/apparmor/files/apparmor_load.sh |
542 |
deleted file mode 100644 |
543 |
index e6fe6b6..0000000 |
544 |
--- a/sys-apps/apparmor/files/apparmor_load.sh |
545 |
+++ /dev/null |
546 |
@@ -1,2 +0,0 @@ |
547 |
-#!/bin/sh |
548 |
-find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -r {} + |
549 |
|
550 |
diff --git a/sys-apps/apparmor/files/apparmor_unload.sh b/sys-apps/apparmor/files/apparmor_unload.sh |
551 |
deleted file mode 100644 |
552 |
index 19e598b..0000000 |
553 |
--- a/sys-apps/apparmor/files/apparmor_unload.sh |
554 |
+++ /dev/null |
555 |
@@ -1,2 +0,0 @@ |
556 |
-#!/bin/sh |
557 |
-find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -R {} \; |
558 |
|
559 |
diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml |
560 |
deleted file mode 100644 |
561 |
index 42d1e8f..0000000 |
562 |
--- a/sys-apps/apparmor/metadata.xml |
563 |
+++ /dev/null |
564 |
@@ -1,14 +0,0 @@ |
565 |
-<?xml version="1.0" encoding="UTF-8"?> |
566 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
567 |
-<pkgmetadata> |
568 |
- <maintainer type="person"> |
569 |
- <email>kensington@g.o</email> |
570 |
- </maintainer> |
571 |
- <maintainer type="project"> |
572 |
- <email>hardened@g.o</email> |
573 |
- <name>Gentoo Hardened</name> |
574 |
- </maintainer> |
575 |
- <upstream> |
576 |
- <remote-id type="launchpad">apparmor</remote-id> |
577 |
- </upstream> |
578 |
-</pkgmetadata> |