[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/, sys-apps/apparmor/
commit: d181f33fb88c9713081e489182948571d99317eb
Author: Ilya Mochalov gmail com>
AuthorDate: Sun Nov 27 21:50:41 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 24 07:08:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d181f33f
sys-apps/apparmor: update to 3.0.8
Signed-off-by: Ilya Mochalov gmail.com>
Signed-off-by: Sam James gentoo.org>
sys-apps/apparmor/Manifest | 1 +
sys-apps/apparmor/apparmor-3.0.8.ebuild| 87 ++
.../apparmor/files/apparmor-3.0.5-makefile.patch | 18 +
3 files changed, 106 insertions(+)
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 1908e085a0ca..e8a4e202d60a 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1,3 @@
DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B
aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c
SHA512
bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B
831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0
SHA512
1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
+DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B
bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1
SHA512
539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
diff --git a/sys-apps/apparmor/apparmor-3.0.8.ebuild
b/sys-apps/apparmor/apparmor-3.0.8.ebuild
new file mode 100644
index ..dfcaed9d635d
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~riscv"
+IUSE="doc"
+
+# Was restricted previously b/c needs apparmor support in kernel
+# TODO: add check to ebuild
+#RESTRICT="test" # bug 675854
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/gettext
+ sys-devel/flex
+ doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.5-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/apparmor-3.0.5-makefile.patch
b/sys-apps/apparmor/files/apparmor-3.0.5-makefile.patch
new file mode 100644
index ..5d4dd9c57e12
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-3.0.5-makefile.patch
@@ -0,0 +1,18 @@
+* 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/, sys-apps/apparmor/
commit: 4d389f1ced86332123f146d725339fae1a31d586
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Jun 4 07:19:31 2021 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Jun 4 07:19:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d389f1c
sys-apps/apparmor: remove 2.13.4
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Michael Palimaka gentoo.org>
sys-apps/apparmor/Manifest | 1 -
sys-apps/apparmor/apparmor-2.13.4.ebuild | 67
.../apparmor/files/apparmor-2.13.1-makefile.patch | 25 --
sys-apps/apparmor/files/apparmor-init | 91 --
4 files changed, 184 deletions(-)
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index db15b30fede..b5b981c8b9f 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,3 +1,2 @@
-DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B
49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4
SHA512
d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B
a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f
SHA512
2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
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 a4c693e37c5..000
--- a/sys-apps/apparmor/apparmor-2.13.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 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
-
- # 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-makefile.patch
b/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch
deleted file mode 100644
index 239ff81f5cd..000
--- 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}
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/, sys-apps/apparmor/
commit: 514bb9c90fb2641b7af156c4d504185dc10db795
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Oct 10 09:33:24 2020 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Oct 10 09:44:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514bb9c9
sys-apps/apparmor: version bump 3.0.0
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Palimaka gentoo.org>
sys-apps/apparmor/Manifest | 1 +
sys-apps/apparmor/apparmor-3.0.0.ebuild| 67
.../apparmor/files/apparmor-3.0.0-makefile.patch | 18 +
sys-apps/apparmor/files/apparmor-init-1| 88 ++
4 files changed, 174 insertions(+)
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 6a8b5e50bbe..89bb054ab20 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1,2 @@
DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B
49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4
SHA512
d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
+DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B
a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f
SHA512
2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
diff --git a/sys-apps/apparmor/apparmor-3.0.0.ebuild
b/sys-apps/apparmor/apparmor-3.0.0.ebuild
new file mode 100644
index 000..662a23505d2
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 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}/${MY_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}-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
+}
+
+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-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/apparmor-3.0.0-makefile.patch
b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch
new file mode 100644
index 000..9c03a4465c3
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch
@@ -0,0 +1,18 @@
+* 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-1
b/sys-apps/apparmor/files/apparmor-init-1
new file mode 100644
index 000..4addaee294b
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-init-1
@@ -0,0 +1,88 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# 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()
[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/, sys-apps/apparmor/
commit: 06e069ec26d5ca1415a572fb08492218844490ab
Author: Michael Palimaka gentoo org>
AuthorDate: Wed May 25 18:09:50 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed May 25 18:10:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e069ec
sys-apps/apparmor: remove 2.8.x
Package-Manager: portage-2.3.0_rc1
sys-apps/apparmor/Manifest | 2 -
sys-apps/apparmor/apparmor-2.8.3.ebuild| 46 --
sys-apps/apparmor/apparmor-2.8.4.ebuild| 46 --
.../apparmor/files/apparmor-2.8.2-makefile.patch | 34
4 files changed, 128 deletions(-)
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 92dc5c7..e3a788d 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,4 +1,2 @@
DIST apparmor-2.10.1.tar.gz 4494037 SHA256
07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512
93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278
WHIRLPOOL
d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25
DIST apparmor-2.10.tar.gz 2421759 SHA256
4d0e224257a29671b694bd9054edf0dd213aa690fd02844ecf3329b86ac506f4 SHA512
f659bc0efca3b0cf30dd5420427f0756a86bb9d5bbb12abe82aa60eb4a7ead7848a2b2d9d9ca9cea28161a9e998c9923cdea55d38755144e3d34da1a5ad52fdd
WHIRLPOOL
762e2e12c6b6a9110c91a11578ef4d83a9a774b3a882a3a08ab4a5af3a16e53f66211fc6b4e68c8ef2a47ec0c312287864584640b0d2fe3c327d95525be710f8
-DIST apparmor-2.8.3.tar.gz 1534245 SHA256
84c2ca7fb6d170e5bb56270f01c9b78e78a991b9eee7fa53a9e6409ef0845c7e SHA512
c1102206fc93e09865a8cbb239164298af298175d7043efa10ab7227c23e7aef664d38fa3b67e82e2263fba9dbc0567fa659233226633b7e26ac80e2c02c78fb
WHIRLPOOL
24ee03843c4cc08e63c4641784bd648f2b85e42b2528e03b3a7d80d5d6b96e1eec5ea9cfdd2d1243dc855c9a05d0661fa3336f8d95b460be3b2bceab51936086
-DIST apparmor-2.8.4.tar.gz 1539923 SHA256
98cb81b2e2e17a8034005d2612ba6c33893486fdf995626f3bb94a4a082371d6 SHA512
d9f15bbfb4cb8428cacc7669099a0ce8acf33cbf309a65fea601f1d23b6e741a403eb4f8d91a8897f1959862f8d2ca8843918e56f511f2230e88476037511177
WHIRLPOOL
0520a5295a1184754c4d4dafe8253f4c0b6c8d0145ee586f0ecdab2d86630b7d08f8fd8ae87658c5663d3410575838b01d8c1ad2faec74271153c0d7a510e35b
diff --git a/sys-apps/apparmor/apparmor-2.8.3.ebuild
b/sys-apps/apparmor/apparmor-2.8.3.ebuild
deleted file mode 100644
index c0385ea..000
--- a/sys-apps/apparmor/apparmor-2.8.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application
security system"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range
1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND="dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- doc? ( dev-tex/latex2html )"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.8.2-makefile.patch
-
- # 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)" arch manpages
- use doc && emake pdf
-}
-
-src_install() {
- default
-
- dodir /etc/apparmor.d
-
- newinitd "${FILESDIR}"/${PN}-init ${PN}
-
- use doc && dodoc techdoc.pdf
-}
diff --git a/sys-apps/apparmor/apparmor-2.8.4.ebuild
b/sys-apps/apparmor/apparmor-2.8.4.ebuild
deleted file mode 100644
index 66acf48..000
--- a/sys-apps/apparmor/apparmor-2.8.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application
security system"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range
1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND="dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- doc? ( dev-tex/latex2html )"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.8.2-makefile.patch
-
- # 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)" arch manpages
- use doc &&
[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/, sys-apps/apparmor/
commit: 8113436e8e6f4167597ac66716da07fb5caac4fd
Author: George Kranis users noreply github
com>
AuthorDate: Sun Jan 10 09:42:58 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Jan 12 16:10:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8113436e
sys-apps/apparmor: Bump to 2.10, fix dynamic linking with libapparmor
sys-apps/apparmor/Manifest | 1 +
sys-apps/apparmor/apparmor-2.10.ebuild | 54 ++
.../files/apparmor-2.10-dynamic-link.patch | 12 +
.../apparmor/files/apparmor-2.10-makefile.patch| 25 ++
4 files changed, 92 insertions(+)
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index dbf34e8..7d9c922 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1,3 @@
+DIST apparmor-2.10.tar.gz 2421759 SHA256
4d0e224257a29671b694bd9054edf0dd213aa690fd02844ecf3329b86ac506f4 SHA512
f659bc0efca3b0cf30dd5420427f0756a86bb9d5bbb12abe82aa60eb4a7ead7848a2b2d9d9ca9cea28161a9e998c9923cdea55d38755144e3d34da1a5ad52fdd
WHIRLPOOL
762e2e12c6b6a9110c91a11578ef4d83a9a774b3a882a3a08ab4a5af3a16e53f66211fc6b4e68c8ef2a47ec0c312287864584640b0d2fe3c327d95525be710f8
DIST apparmor-2.8.3.tar.gz 1534245 SHA256
84c2ca7fb6d170e5bb56270f01c9b78e78a991b9eee7fa53a9e6409ef0845c7e SHA512
c1102206fc93e09865a8cbb239164298af298175d7043efa10ab7227c23e7aef664d38fa3b67e82e2263fba9dbc0567fa659233226633b7e26ac80e2c02c78fb
WHIRLPOOL
24ee03843c4cc08e63c4641784bd648f2b85e42b2528e03b3a7d80d5d6b96e1eec5ea9cfdd2d1243dc855c9a05d0661fa3336f8d95b460be3b2bceab51936086
DIST apparmor-2.8.4.tar.gz 1539923 SHA256
98cb81b2e2e17a8034005d2612ba6c33893486fdf995626f3bb94a4a082371d6 SHA512
d9f15bbfb4cb8428cacc7669099a0ce8acf33cbf309a65fea601f1d23b6e741a403eb4f8d91a8897f1959862f8d2ca8843918e56f511f2230e88476037511177
WHIRLPOOL
0520a5295a1184754c4d4dafe8253f4c0b6c8d0145ee586f0ecdab2d86630b7d08f8fd8ae87658c5663d3410575838b01d8c1ad2faec74271153c0d7a510e35b
diff --git a/sys-apps/apparmor/apparmor-2.10.ebuild
b/sys-apps/apparmor/apparmor-2.10.ebuild
new file mode 100644
index 000..377552b
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.10.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs versionator
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application
security system"
+HOMEPAGE="http://apparmor.net/;
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range
1-2)/${PV}/+download/${P}.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.10-makefile.patch"
+ "${FILESDIR}/${PN}-2.10-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
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
+ use doc && emake pdf
+}
+
+src_install() {
+ emake DESTDIR="${D}" USE_SYSTEM=1 install
+
+ dodir /etc/apparmor.d/disable
+
+ newinitd "${FILESDIR}"/${PN}-init ${PN}
+
+ use doc && dodoc techdoc.pdf
+}
diff --git a/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
b/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
new file mode 100644
index 000..24263d0
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
b/Makefile
+@@ -87,7 +87,7 @@
+ AAREOBJECT = ${AAREDIR}/libapparmor_re.a
+ AAREOBJECTS = $(AAREOBJECT)
+ AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L.
+-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.10-makefile.patch
b/sys-apps/apparmor/files/apparmor-2.10-makefile.patch
new file mode 100644
index 000..397534a
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-2.10-makefile.patch
@@ -0,0 +1,25 @@
+--- a/Makefile
b/Makefile
+@@ -31,7 +31,7 @@
+ CONFDIR=/etc/apparmor
+ INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
+ LOCALEDIR=/usr/share/locale
+-MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5
++MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8
+
+ YACC := /usr/bin/bison
+ YFLAGS:= -d
+@@ -284,11 +284,9 @@
+ .PHONY: install-indep
+ install-indep:
+ install -m 755 -d $(INSTALL_CONFDIR)
+- install -m 644 subdomain.conf $(INSTALL_CONFDIR)
++ install
