[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2024-03-14 Thread Sam James
commit: 138b6134d1d4aa11a85ca2004b9fe886e52f7398
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 15 02:43:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 15 02:43:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138b6134

sys-apps/apparmor: filter LTO

ODR violations. Seems to be worked around upstream with partitioning...

Closes: https://bugs.gentoo.org/863524
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.10.ebuild | 9 -
 sys-apps/apparmor/apparmor-3.0.8.ebuild  | 9 -
 sys-apps/apparmor/apparmor-3.1.4.ebuild  | 9 -
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.10.ebuild 
b/sys-apps/apparmor/apparmor-3.0.10.ebuild
index 0ad9bb9bbc01..3bff9b266481 100644
--- a/sys-apps/apparmor/apparmor-3.0.10.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -51,6 +51,13 @@ src_prepare() {
-i ../common/list_af_names.sh || die
 }
 
+src_configure() {
+   # ODR violations (bug #863524)
+   filter-lto
+
+   default
+}
+
 src_compile() {
emake \
AR="$(tc-getAR)" \

diff --git a/sys-apps/apparmor/apparmor-3.0.8.ebuild 
b/sys-apps/apparmor/apparmor-3.0.8.ebuild
index 0ad9bb9bbc01..3bff9b266481 100644
--- a/sys-apps/apparmor/apparmor-3.0.8.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -51,6 +51,13 @@ src_prepare() {
-i ../common/list_af_names.sh || die
 }
 
+src_configure() {
+   # ODR violations (bug #863524)
+   filter-lto
+
+   default
+}
+
 src_compile() {
emake \
AR="$(tc-getAR)" \

diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild 
b/sys-apps/apparmor/apparmor-3.1.4.ebuild
index 7e740c90b8c3..141029aefee8 100644
--- a/sys-apps/apparmor/apparmor-3.1.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -51,6 +51,13 @@ src_prepare() {
-i ../common/list_af_names.sh || die
 }
 
+src_configure() {
+   # ODR violations (bug #863524)
+   filter-lto
+
+   default
+}
+
 src_compile() {
emake \
AR="$(tc-getAR)" \



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2024-01-08 Thread Sam James
commit: 2c0183a43b307e409451935ca1f4f9bee6894a40
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  8 12:09:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  8 12:25:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0183a4

sys-apps/apparmor: sys-devel/bison -> app-alternatives/yacc

All of these will be using app-alternatives/yacc anyway as they're not unsetting

YACC or LEX, so make the dep reflect reality.

(Included both YACC and LEX out of conservatism.)

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.10.ebuild | 2 +-
 sys-apps/apparmor/apparmor-3.0.8.ebuild  | 2 +-
 sys-apps/apparmor/apparmor-3.1.4.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.10.ebuild 
b/sys-apps/apparmor/apparmor-3.0.10.ebuild
index 84ff1cc79d7b..0ad9bb9bbc01 100644
--- a/sys-apps/apparmor/apparmor-3.0.10.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.10.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
dev-lang/perl
sys-apps/which
-   sys-devel/bison
+   app-alternatives/yacc
sys-devel/gettext
app-alternatives/lex
doc? ( dev-tex/latex2html )

diff --git a/sys-apps/apparmor/apparmor-3.0.8.ebuild 
b/sys-apps/apparmor/apparmor-3.0.8.ebuild
index 84ff1cc79d7b..0ad9bb9bbc01 100644
--- a/sys-apps/apparmor/apparmor-3.0.8.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.8.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
dev-lang/perl
sys-apps/which
-   sys-devel/bison
+   app-alternatives/yacc
sys-devel/gettext
app-alternatives/lex
doc? ( dev-tex/latex2html )

diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild 
b/sys-apps/apparmor/apparmor-3.1.4.ebuild
index a86368789f51..7e740c90b8c3 100644
--- a/sys-apps/apparmor/apparmor-3.1.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.1.4.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
dev-lang/perl
sys-apps/which
-   sys-devel/bison
+   app-alternatives/yacc
sys-devel/gettext
app-alternatives/lex
doc? ( dev-tex/latex2html )



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2024-01-03 Thread Sam James
commit: ed815a23f11efdd1001a7d0890c108651a722168
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 22:30:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 22:30:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed815a23

sys-apps/apparmor-utils: Keyword 3.1.4-r1 ppc64, #921300

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
index fe4d9767c5dd..a154b882fce2 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2024-01-03 Thread Sam James
commit: 052d8336700531ae5ecc00df47d07443d6800c4a
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 22:30:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 22:30:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=052d8336

sys-apps/apparmor: Keyword 3.1.4 ppc64, #921300

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/apparmor-3.1.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild 
b/sys-apps/apparmor/apparmor-3.1.4.ebuild
index ffb689f55afc..1bc424e0cf4d 100644
--- a/sys-apps/apparmor/apparmor-3.1.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-11-05 Thread Sam James
commit: 1fad9916c322c87f94b51899ff6b211bf2e9be1f
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  5 09:54:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  5 09:54:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fad9916

sys-apps/apparmor-utils: Stabilize 3.1.4-r1 amd64, #916842

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
index 702656d7f4f3..ee99e0d382c7 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-11-05 Thread Sam James
commit: cc0698bd2f69411a51f8ef99ddb08066d99eb5b9
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  5 09:54:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  5 09:54:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0698bd

sys-apps/apparmor-utils: Stabilize 3.1.4-r1 arm64, #916842

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
index ee99e0d382c7..fe4d9767c5dd 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2023-11-05 Thread Arthur Zamarin
commit: 3aeaa75a34dfa35044618e2ff1810c489c463536
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov  5 08:45:51 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov  5 08:45:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aeaa75a

sys-apps/apparmor: Stabilize 3.1.4 arm64, #916841

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/apparmor/apparmor-3.1.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild 
b/sys-apps/apparmor/apparmor-3.1.4.ebuild
index 3c6676d4ab63..d926393c0bf5 100644
--- a/sys-apps/apparmor/apparmor-3.1.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.1.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 arm64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2023-11-05 Thread Arthur Zamarin
commit: ba6b1c2324e2a539062c3a99ed9245ec77647999
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov  5 08:45:52 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov  5 08:45:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6b1c23

sys-apps/apparmor: Stabilize 3.1.4 amd64, #916841

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/apparmor/apparmor-3.1.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild 
b/sys-apps/apparmor/apparmor-3.1.4.ebuild
index d926393c0bf5..ffb689f55afc 100644
--- a/sys-apps/apparmor/apparmor-3.1.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.1.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2023-07-15 Thread Arthur Zamarin
commit: d525b593146436e816e3204f86d177470c886cce
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 15 15:07:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 15 15:07:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d525b593

sys-apps/apparmor: Stabilize 3.0.10 arm64, #909207

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.10.ebuild 
b/sys-apps/apparmor/apparmor-3.0.10.ebuild
index 724fe1e0d6cb..ffb689f55afc 100644
--- a/sys-apps/apparmor/apparmor-3.0.10.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.10.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-07-15 Thread Arthur Zamarin
commit: 6e3ceb65593c970f36d2d944f6a89b13a6638310
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 15 15:07:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 15 15:07:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3ceb65

sys-apps/apparmor-utils: Stabilize 3.0.10-r1 arm64, #909207

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
index ee99e0d382c7..fe4d9767c5dd 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/

2023-07-01 Thread Conrad Kostecki
commit: 107b3e408a03888f7acf60376c62b96592eb4ac3
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Jun 28 17:50:45 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Jul  2 01:34:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107b3e40

sys-apps/apparmor: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31660
Signed-off-by: Conrad Kostecki  gentoo.org>

 sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch | 18 --
 1 file changed, 18 deletions(-)

diff --git a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch 
b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch
deleted file mode 100644
index 9c03a4465c36..
--- a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-* 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}
- 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-06-26 Thread Sam James
commit: cf31d0b02f9e372d573e202f8949a395f524fd84
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 26 19:49:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 26 19:49:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf31d0b0

sys-apps/apparmor-utils: drop 3.0.3, 3.0.4

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  2 -
 .../apparmor-utils/apparmor-utils-3.0.3.ebuild | 87 --
 .../apparmor-utils/apparmor-utils-3.0.4.ebuild | 87 --
 3 files changed, 176 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 81f3ecd13cef..86b70cba9120 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,5 +1,3 @@
 DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 
8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20
 SHA512 
94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
-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
 DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B 
a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae
 SHA512 
db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
deleted file mode 100644
index 9f9ce15e6b31..
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-   dev-lang/perl
-   ~sys-libs/libapparmor-${PV}
-   ${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   dev-python/notify2[${PYTHON_USEDEP}]
-   dev-python/psutil[${PYTHON_USEDEP}]
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' || die
-
-   sed -i utils/aa-remove-unknown \
-   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   local -x PYTHONDONTWRITEBYTECODE=
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --optimize 2 --version=${PV}
-   }
-
-   python_foreach_impl 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-06-26 Thread Sam James
commit: 53de69d91fec670e97baa5add1127209147572f8
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 26 19:47:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 26 19:49:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53de69d9

sys-apps/apparmor-utils: drop obsolete Perl dependencies

Quoting Han from the bug:
"""
All ebuilds for sys-apps/apparmor-utils currently in the tree depend on Perl 
and several Perl modules,
but those dependencies are unnecessary because upstream has rewritten all 
utilities in Python.

The last rewrite was before the 3.0.0 release 
(https://gitlab.com/apparmor/apparmor/-/commit/a74d7cf51cf5d87d5d362cb7dd279a0034029631)
and the README since states "Perl is no longer needed since none of the 
utilities shipped to end users depend
on it anymore."
"""

Closes: https://bugs.gentoo.org/909203
Signed-off-by: Sam James  gentoo.org>

 ...ils-3.0.10.ebuild => apparmor-utils-3.0.10-r1.ebuild} | 16 
 ...utils-3.1.4.ebuild => apparmor-utils-3.1.4-r1.ebuild} | 16 
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
similarity index 81%
rename from sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild
rename to sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
index 24b253ee6dba..702656d7f4f3 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-inherit perl-module python-r1 toolchain-funcs
+inherit python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -20,22 +20,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
 
 COMMON_DEPEND="
-   dev-lang/perl
~sys-libs/libapparmor-${PV}
${PYTHON_DEPS}"
 DEPEND="${COMMON_DEPEND}
sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-libs/libapparmor-${PV}[python,${PYTHON_USEDEP}]
~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
dev-python/notify2[${PYTHON_USEDEP}]
-   dev-python/psutil[${PYTHON_USEDEP}]
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
+   dev-python/psutil[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/apparmor-${PV}
 
@@ -66,9 +60,7 @@ src_compile() {
 
 src_install() {
pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+   emake DESTDIR="${D}" 
VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
 
install_python() {
local -x PYTHONDONTWRITEBYTECODE=

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
similarity index 81%
rename from sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild
rename to sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
index 24b253ee6dba..702656d7f4f3 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-inherit perl-module python-r1 toolchain-funcs
+inherit python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -20,22 +20,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
 
 COMMON_DEPEND="
-   dev-lang/perl
~sys-libs/libapparmor-${PV}
${PYTHON_DEPS}"
 DEPEND="${COMMON_DEPEND}
sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-libs/libapparmor-${PV}[python,${PYTHON_USEDEP}]
~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
dev-python/notify2[${PYTHON_USEDEP}]
-   dev-python/psutil[${PYTHON_USEDEP}]
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
+   dev-python/psutil[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/apparmor-${PV}
 
@@ -66,9 +60,7 @@ src_compile() {
 
 src_install() {
pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+   emake DESTDIR="${D}" 
VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
 
install_python() {
local -x PYTHONDONTWRITEBYTECODE=



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2023-06-26 Thread Sam James
commit: 665f6c56a9e1fc6816861dda0dd4b4eb8c79f2da
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 26 19:49:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 26 19:49:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=665f6c56

sys-apps/apparmor: drop 3.0.3, 3.0.4

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/Manifest  |  2 -
 sys-apps/apparmor/apparmor-3.0.3.ebuild | 85 
 sys-apps/apparmor/apparmor-3.0.4.ebuild | 87 -
 3 files changed, 174 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 81f3ecd13cef..86b70cba9120 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,5 +1,3 @@
 DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 
8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20
 SHA512 
94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
-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
 DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B 
a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae
 SHA512 
db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4

diff --git a/sys-apps/apparmor/apparmor-3.0.3.ebuild 
b/sys-apps/apparmor/apparmor-3.0.3.ebuild
deleted file mode 100644
index 04328c25820c..
--- a/sys-apps/apparmor/apparmor-3.0.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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"
-IUSE="doc"
-
-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.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
-
-   # 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/apparmor-3.0.4.ebuild 
b/sys-apps/apparmor/apparmor-3.0.4.ebuild
deleted file mode 100644
index c300dd4a3052..
--- a/sys-apps/apparmor/apparmor-3.0.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-06-01 Thread Sam James
commit: ea1343c43fb9f523163f18f6ac9ae308c57281e9
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 21:28:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 21:28:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1343c4

sys-apps/apparmor-utils: Stabilize 3.0.8 amd64, #907586

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild
index 33b5e96abdfd..7b0f7036c5aa 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-06-01 Thread Sam James
commit: 886be429a8b79230579b3d2659bee09b673c1105
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 21:23:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 21:23:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=886be429

sys-apps/apparmor-utils: Stabilize 3.0.8 arm64, #907586

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild
index c0cb0c3da955..33b5e96abdfd 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2023-06-01 Thread Sam James
commit: bf093164a5e242bb6d32db1ceb373195dc560446
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 21:06:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 21:06:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf093164

sys-apps/apparmor: Stabilize 3.0.8 arm64, #907585

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.8.ebuild 
b/sys-apps/apparmor/apparmor-3.0.8.ebuild
index 724fe1e0d6cb..ffb689f55afc 100644
--- a/sys-apps/apparmor/apparmor-3.0.8.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.8.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2023-06-01 Thread Arthur Zamarin
commit: f53b6cab8b31070226470c9ea653d77006230027
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun  1 16:53:39 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun  1 16:53:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53b6cab

sys-apps/apparmor: Stabilize 3.0.8 amd64, #907585

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.8.ebuild 
b/sys-apps/apparmor/apparmor-3.0.8.ebuild
index dfcaed9d635d..724fe1e0d6cb 100644
--- a/sys-apps/apparmor/apparmor-3.0.8.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-05-31 Thread Sam James
commit: 98d07856614008626b596d28d3bd1b5df7271cf6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:20:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:20:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d07856

sys-apps/apparmor-utils: add gitlab upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/apparmor-utils/metadata.xml 
b/sys-apps/apparmor-utils/metadata.xml
index 22230f2666f5..e22db4165e51 100644
--- a/sys-apps/apparmor-utils/metadata.xml
+++ b/sys-apps/apparmor-utils/metadata.xml
@@ -11,5 +11,6 @@


apparmor
+   apparmor/apparmor

 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2023-05-31 Thread Sam James
commit: 899ae8190e63c5872a00d253c94f3119f2b186ed
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:16:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:16:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899ae819

sys-apps/apparmor: add 3.1.4

Bug: https://bugs.gentoo.org/876965
Bug: https://bugs.gentoo.org/900867
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/Manifest  |  1 +
 sys-apps/apparmor/apparmor-3.1.4.ebuild | 87 +
 2 files changed, 88 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 7775e1966a07..81f3ecd13cef 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -2,3 +2,4 @@ DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 
8fa094dac6140949cecad8fdf056c6e11929
 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
+DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B 
a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae
 SHA512 
db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4

diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild 
b/sys-apps/apparmor/apparmor-3.1.4.ebuild
new file mode 100644
index ..3c6676d4ab63
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.1.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 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"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2023-05-31 Thread Sam James
commit: e486e11adfbaca49a68729a8e31087cbd1291f27
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:09:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:09:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e486e11a

sys-apps/apparmor: add 3.0.10

Bug: https://bugs.gentoo.org/876965
Bug: https://bugs.gentoo.org/900867
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/Manifest   |  1 +
 sys-apps/apparmor/apparmor-3.0.10.ebuild | 87 
 2 files changed, 88 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index e8a4e202d60a..7775e1966a07 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,3 +1,4 @@
+DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 
8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20
 SHA512 
94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
 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.10.ebuild 
b/sys-apps/apparmor/apparmor-3.0.10.ebuild
new file mode 100644
index ..3c6676d4ab63
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 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"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-05-31 Thread Sam James
commit: 978b8b9d4dbf8b65239ccf1043c24b8b1c35b0db
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:17:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:17:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978b8b9d

sys-apps/apparmor-utils: add 3.0.10

Bug: https://bugs.gentoo.org/876965
Bug: https://bugs.gentoo.org/900867
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-3.0.10.ebuild| 87 ++
 2 files changed, 88 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index e8a4e202d60a..7775e1966a07 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,3 +1,4 @@
+DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 
8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20
 SHA512 
94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
 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-utils/apparmor-utils-3.0.10.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild
new file mode 100644
index ..24b253ee6dba
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   dev-python/notify2[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   local -x PYTHONDONTWRITEBYTECODE=
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --optimize 2 --version=${PV}
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+  

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2023-05-31 Thread Sam James
commit: 6ca35d944cd6e6a20761d0bc9533f9aac4b53fab
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:18:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:18:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca35d94

sys-apps/apparmor-utils: add 3.1.4

Bug: https://bugs.gentoo.org/876965
Bug: https://bugs.gentoo.org/900867
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-3.1.4.ebuild | 87 ++
 2 files changed, 88 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 7775e1966a07..81f3ecd13cef 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -2,3 +2,4 @@ DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 
8fa094dac6140949cecad8fdf056c6e11929
 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
+DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B 
a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae
 SHA512 
db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild
new file mode 100644
index ..24b253ee6dba
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   dev-python/notify2[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   local -x PYTHONDONTWRITEBYTECODE=
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --optimize 2 --version=${PV}
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+   popd > /dev/null || die
+
+   pushd 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2023-05-31 Thread Sam James
commit: 1725dfa592ec15fa412360a8dd09f61967a8a70e
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:02:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:02:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1725dfa5

sys-apps/apparmor: add gitlab upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml
index a1ec120ea86f..1e1894290d46 100644
--- a/sys-apps/apparmor/metadata.xml
+++ b/sys-apps/apparmor/metadata.xml
@@ -12,5 +12,6 @@

cpe:/a:canonical:apparmor
apparmor
+   apparmor/apparmor

 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/, sys-apps/apparmor/

2022-12-23 Thread Sam James
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-utils/

2022-12-23 Thread Sam James
commit: bba64beda1f100a5586dfaf7bb68e03bf8b07a44
Author: Ilya Mochalov  gmail  com>
AuthorDate: Sun Nov 27 21:54:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 24 07:08:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba64bed

sys-apps/apparmor-utils: update to 3.0.8

Signed-off-by: Ilya Mochalov  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-3.0.8.ebuild | 87 ++
 2 files changed, 88 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 1908e085a0ca..e8a4e202d60a 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/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-utils/apparmor-utils-3.0.8.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild
new file mode 100644
index ..0ef73bf6738b
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-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
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   dev-python/notify2[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   local -x PYTHONDONTWRITEBYTECODE=
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --optimize 2 --version=${PV}
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-12-20 Thread Arthur Zamarin
commit: 56b96a11615426cf259ebf1384509bf7a237c484
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec 20 20:54:43 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec 20 20:54:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b96a11

sys-apps/apparmor-utils: Stabilize 3.0.4 arm64, #887543

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
index 04b10feb69eb..caf6cb7e543d 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-12-20 Thread Arthur Zamarin
commit: 2dd37d94f7b9b5e176f51ca00a381e3a71fd69c4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec 20 20:54:42 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec 20 20:54:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd37d94

sys-apps/apparmor: Stabilize 3.0.4 arm64, #887543

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.4.ebuild 
b/sys-apps/apparmor/apparmor-3.0.4.ebuild
index c91aeae051c0..c300dd4a3052 100644
--- a/sys-apps/apparmor/apparmor-3.0.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-12-20 Thread Sam James
commit: 4f27e50899771a8acf017d7783b3535a3c2b3289
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 20 20:38:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 20 20:38:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f27e508

sys-apps/apparmor: Stabilize 3.0.4 amd64, #887543

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.4.ebuild 
b/sys-apps/apparmor/apparmor-3.0.4.ebuild
index 94f291d4b028..c91aeae051c0 100644
--- a/sys-apps/apparmor/apparmor-3.0.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-12-20 Thread Sam James
commit: cbb39dd0671ad798197a0091ba0d212dbd927953
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 20 20:38:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 20 20:38:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb39dd0

sys-apps/apparmor-utils: Stabilize 3.0.4 amd64, #887543

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
index 0ef73bf6738b..04b10feb69eb 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-10-28 Thread Sam James
commit: 838eda36e4ba3e084732ee24151868bd988c3568
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 06:59:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 06:59:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838eda36

sys-apps/apparmor: add which BDEPEND

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.3.ebuild | 4 +++-
 sys-apps/apparmor/apparmor-3.0.4.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.3.ebuild 
b/sys-apps/apparmor/apparmor-3.0.3.ebuild
index 2eef41797c29..04328c25820c 100644
--- a/sys-apps/apparmor/apparmor-3.0.3.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.3.ebuild
@@ -19,8 +19,10 @@ IUSE="doc"
 RESTRICT="test" # bug 675854
 
 RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-lang/perl
+   sys-apps/which
sys-devel/bison
sys-devel/gettext
sys-devel/flex

diff --git a/sys-apps/apparmor/apparmor-3.0.4.ebuild 
b/sys-apps/apparmor/apparmor-3.0.4.ebuild
index ef1b175456ce..94f291d4b028 100644
--- a/sys-apps/apparmor/apparmor-3.0.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.4.ebuild
@@ -21,8 +21,10 @@ IUSE="doc"
 #RESTRICT="test" # bug 675854
 
 RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-lang/perl
+   sys-apps/which
sys-devel/bison
sys-devel/gettext
sys-devel/flex



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-10-20 Thread Sam James
commit: d78426c9ee8abec4ce45f824dde3658ad334adc9
Author: kochera  google  com>
AuthorDate: Thu Oct 20 14:22:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 20 23:32:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d78426c9

sys-apps/apparmor: Add cpe_uri for apparmor package.

Signed-off-by: Michael Kochera  google.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml
index 22230f2666f5..a1ec120ea86f 100644
--- a/sys-apps/apparmor/metadata.xml
+++ b/sys-apps/apparmor/metadata.xml
@@ -10,6 +10,7 @@
Gentoo Hardened


+   cpe:/a:canonical:apparmor
apparmor

 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-10-18 Thread Jakov Smolić
commit: 0a614a93a0a3620cbb415f5e0aa9311e29f059e1
Author: Xin Yang  icloud  com>
AuthorDate: Fri Oct 14 11:59:44 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Oct 18 16:31:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a614a93

sys-apps/apparmor: keyword 3.0.4 riscv, #877087

Signed-off-by: Xin Yang  icloud.com>
Signed-off-by: Jakov Smolić  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.4.ebuild 
b/sys-apps/apparmor/apparmor-3.0.4.ebuild
index d1413fd5619e..ef1b175456ce 100644
--- a/sys-apps/apparmor/apparmor-3.0.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-10-18 Thread Jakov Smolić
commit: 18974c258b2fe62ef81dd0287c34d86ac712c11a
Author: Xin Yang  icloud  com>
AuthorDate: Fri Oct 14 12:32:55 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Oct 18 16:31:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18974c25

sys-apps/apparmor-utils: keyword 3.0.4 riscv, #877087

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/2
Signed-off-by: Jakov Smolić  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
index fdeef59727a9..0ef73bf6738b 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-09-01 Thread Arthur Zamarin
commit: a942117780026df4ca86f75445b49b0384c4e5a3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep  2 04:40:40 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep  2 04:40:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9421177

sys-apps/apparmor: Stabilize 3.0.3 arm64, #867754

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.3.ebuild 
b/sys-apps/apparmor/apparmor-3.0.3.ebuild
index 4cbc200ad95b..2eef41797c29 100644
--- a/sys-apps/apparmor/apparmor-3.0.3.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="doc"
 
 RESTRICT="test" # bug 675854



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-09-01 Thread Arthur Zamarin
commit: 4b036fcaaeaad9cc33e17dd20ee459abc5752bb5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep  2 04:40:40 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep  2 04:40:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b036fca

sys-apps/apparmor-utils: Stabilize 3.0.3 arm64, #867754

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
index 7db7337d04f3..77690904deca 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 arm64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-09-01 Thread Sam James
commit: 46717d57ef4c1a87d2cdd21489ca70a403d7278d
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  1 22:39:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  1 22:39:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46717d57

sys-apps/apparmor-utils: Keyword 3.0.4 arm64, #867751

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
index 26e8c7c92a7a..fdeef59727a9 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-06-24 Thread Michael Palimaka
commit: 3883d55b6cbe9fe50fc1474de1fc090b07db5c2d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jun 24 08:39:30 2022 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jun 24 08:39:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3883d55b

sys-apps/apparmor-utils: remove 3.0.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 -
 .../apparmor-utils/apparmor-utils-3.0.1.ebuild | 88 --
 2 files changed, 89 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 6002b9f2f989..1908e085a0ca 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,3 +1,2 @@
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B 
c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129
 SHA512 
e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B 
aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c
 SHA512 
bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 
831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0
 SHA512 
1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
deleted file mode 100644
index a60091bfffbc..
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-   dev-lang/perl
-   ~sys-libs/libapparmor-${PV}
-   ${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   dev-python/notify2[${PYTHON_USEDEP}]
-   dev-python/psutil[${PYTHON_USEDEP}]
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' || die
-
-   sed -i utils/aa-remove-unknown \
-   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   local -x PYTHONDONTWRITEBYTECODE=
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --optimize 2
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   emake install DESTDIR="${D}" USE_SYSTEM=1
-   popd > /dev/null || die
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-06-24 Thread Michael Palimaka
commit: fc74ce08b02ec328cfbc46cf733a1ae0678741bf
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jun 24 08:39:54 2022 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jun 24 08:39:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc74ce08

sys-apps/apparmor: remove 3.0.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/Manifest  |  1 -
 sys-apps/apparmor/apparmor-3.0.1.ebuild | 83 -
 2 files changed, 84 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 6002b9f2f989..1908e085a0ca 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,3 +1,2 @@
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B 
c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129
 SHA512 
e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B 
aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c
 SHA512 
bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 
831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0
 SHA512 
1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca

diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild 
b/sys-apps/apparmor/apparmor-3.0.1.ebuild
deleted file mode 100644
index 5dd3f3e6c2de..
--- a/sys-apps/apparmor/apparmor-3.0.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 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 ~arm64"
-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
-
-   # 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"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-06-17 Thread Agostino Sarubbo
commit: 7322c61d615093d280d4d710857383e79ddd9066
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 17 06:54:53 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 17 06:54:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7322c61d

sys-apps/apparmor-utils: amd64 stable wrt bug #852659

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
index 26e8c7c92a7a..7db7337d04f3 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-06-17 Thread Agostino Sarubbo
commit: 26d67ce2d41a6d35a0f7fc45a22c13722f3b61f4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 17 06:54:46 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 17 06:54:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d67ce2

sys-apps/apparmor: amd64 stable wrt bug #852659

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.3.ebuild 
b/sys-apps/apparmor/apparmor-3.0.3.ebuild
index 4c5fe4d4179a..4cbc200ad95b 100644
--- a/sys-apps/apparmor/apparmor-3.0.3.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="doc"
 
 RESTRICT="test" # bug 675854



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-06-16 Thread Sam James
commit: b592aba396ee8f29e10887c66a392dfe517e9640
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 17 01:05:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 01:09:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b592aba3

sys-apps/apparmor: add 3.0.4

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/Manifest  |  1 +
 sys-apps/apparmor/apparmor-3.0.4.ebuild | 85 +
 2 files changed, 86 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 76c9ff7d636a..6002b9f2f989 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1,3 @@
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B 
c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129
 SHA512 
e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B 
aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c
 SHA512 
bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
+DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 
831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0
 SHA512 
1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca

diff --git a/sys-apps/apparmor/apparmor-3.0.4.ebuild 
b/sys-apps/apparmor/apparmor-3.0.4.ebuild
new file mode 100644
index ..d1413fd5619e
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.4.ebuild
@@ -0,0 +1,85 @@
+# 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"
+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}
+   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
+
+   # 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"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-06-16 Thread Sam James
commit: d394f90e95b64973e90ee51b8e2e82a9f3f7beb9
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 17 01:07:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 01:09:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d394f90e

sys-apps/apparmor-utils: add 3.0.4

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-3.0.4.ebuild | 87 ++
 2 files changed, 88 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 76c9ff7d636a..6002b9f2f989 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1,3 @@
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B 
c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129
 SHA512 
e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B 
aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c
 SHA512 
bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
+DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 
831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0
 SHA512 
1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
new file mode 100644
index ..26e8c7c92a7a
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   dev-python/notify2[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   local -x PYTHONDONTWRITEBYTECODE=
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --optimize 2 --version=${PV}
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-06-16 Thread Sam James
commit: 5bba6cb4dd64117b4f94be335e6657241acaf4cd
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun 14 10:09:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 00:48:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bba6cb4

sys-apps/apparmor-utils: enable py3.10, py3.11 and disable py3.7

Signed-off-by: Joonas Niilola  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/25895
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
index 00aa102d612f..1127f241e487 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit perl-module python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-06-16 Thread Sam James
commit: fa222c2fbaa23497265f119a0f912042c3316639
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 17 00:52:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 00:52:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa222c2f

sys-apps/apparmor-utils: pass version to python-tools-setup.py

Avoids setuptools warning.

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
index 1127f241e487..26e8c7c92a7a 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
@@ -73,7 +73,7 @@ src_install() {
install_python() {
local -x PYTHONDONTWRITEBYTECODE=
"${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --optimize 2
+   --root="${D}" --optimize 2 --version=${PV}
}
 
python_foreach_impl install_python



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, media-sound/mp3diags/, dev-util/gource/, ...

2022-04-06 Thread Sam James
commit: d46d317118783d1c35f4f0e4daff02a45987869a
Author: John Helmert III  gentoo  org>
AuthorDate: Wed Apr  6 14:20:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  6 18:20:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46d3171

*/*: add  tags for kensington

Signed-off-by: John Helmert III  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 acct-group/unrealircd/metadata.xml   | 1 +
 acct-user/unrealircd/metadata.xml| 1 +
 app-admin/bitwarden-desktop-bin/metadata.xml | 1 +
 app-admin/keepass/metadata.xml   | 1 +
 app-forensics/rkhunter/metadata.xml  | 1 +
 app-misc/asciinema/metadata.xml  | 1 +
 app-misc/ytree/metadata.xml  | 1 +
 app-portage/tatt/metadata.xml| 1 +
 app-text/ansifilter/metadata.xml | 1 +
 dev-games/tiled/metadata.xml | 1 +
 dev-libs/mimetic/metadata.xml| 1 +
 dev-python/cachelib/metadata.xml | 1 +
 dev-python/keep/metadata.xml | 1 +
 dev-util/gource/metadata.xml | 1 +
 dev-util/howdoi/metadata.xml | 1 +
 dev-util/rpmdevtools/metadata.xml| 1 +
 media-fonts/ttf-bitstream-vera/metadata.xml  | 1 +
 media-gfx/evoluspencil/metadata.xml  | 1 +
 media-sound/mp3diags/metadata.xml| 1 +
 net-analyzer/testssl/metadata.xml| 1 +
 net-irc/unrealircd/metadata.xml  | 1 +
 net-misc/sslh/metadata.xml   | 1 +
 sec-policy/apparmor-profiles/metadata.xml| 1 +
 sys-apps/apparmor-utils/metadata.xml | 1 +
 sys-apps/apparmor/metadata.xml   | 1 +
 sys-apps/msr-tools/metadata.xml  | 1 +
 sys-auth/elogind/metadata.xml| 1 +
 sys-libs/libapparmor/metadata.xml| 1 +
 28 files changed, 28 insertions(+)

diff --git a/acct-group/unrealircd/metadata.xml 
b/acct-group/unrealircd/metadata.xml
index 7485a847ac22..ebced1b9146f 100644
--- a/acct-group/unrealircd/metadata.xml
+++ b/acct-group/unrealircd/metadata.xml
@@ -3,6 +3,7 @@
 

kensing...@gentoo.org
+   Michael Palimaka


s...@gentoo.org

diff --git a/acct-user/unrealircd/metadata.xml 
b/acct-user/unrealircd/metadata.xml
index 7485a847ac22..ebced1b9146f 100644
--- a/acct-user/unrealircd/metadata.xml
+++ b/acct-user/unrealircd/metadata.xml
@@ -3,6 +3,7 @@
 

kensing...@gentoo.org
+   Michael Palimaka


s...@gentoo.org

diff --git a/app-admin/bitwarden-desktop-bin/metadata.xml 
b/app-admin/bitwarden-desktop-bin/metadata.xml
index 34215680d62d..df0ddc652ae7 100644
--- a/app-admin/bitwarden-desktop-bin/metadata.xml
+++ b/app-admin/bitwarden-desktop-bin/metadata.xml
@@ -3,6 +3,7 @@
 

kensing...@gentoo.org
+   Michael Palimaka


bitwarden/desktop

diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
index 39fcb99b8467..cd5c27e13573 100644
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@@ -6,6 +6,7 @@


kensing...@gentoo.org
+   Michael Palimaka


proxy-ma...@gentoo.org

diff --git a/app-forensics/rkhunter/metadata.xml 
b/app-forensics/rkhunter/metadata.xml
index 4e8f6f59dab5..a2f63a17519c 100644
--- a/app-forensics/rkhunter/metadata.xml
+++ b/app-forensics/rkhunter/metadata.xml
@@ -3,6 +3,7 @@
 

kensing...@gentoo.org
+   Michael Palimaka


rkhunter

diff --git a/app-misc/asciinema/metadata.xml b/app-misc/asciinema/metadata.xml
index d67512285268..6295b4bacf5c 100644
--- a/app-misc/asciinema/metadata.xml
+++ b/app-misc/asciinema/metadata.xml
@@ -3,6 +3,7 @@
 

kensing...@gentoo.org
+   Michael Palimaka


asciinema/asciinema

diff --git a/app-misc/ytree/metadata.xml b/app-misc/ytree/metadata.xml
index 0563834f5561..4c0df79c2637 100644
--- a/app-misc/ytree/metadata.xml
+++ b/app-misc/ytree/metadata.xml
@@ -3,5 +3,6 @@
 

kensing...@gentoo.org
+   Michael Palimaka

 

diff --git a/app-portage/tatt/metadata.xml b/app-portage/tatt/metadata.xml
index 2f187be3..04baaae00aa1 100644
--- a/app-portage/tatt/metadata.xml
+++ b/app-portage/tatt/metadata.xml
@@ -3,6 +3,7 @@
 
   
 kensing...@gentoo.org
+Michael Palimaka
   
   
 Install template scripts to be used with tatt

diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
index 0563834f5561..4c0df79c2637 100644
--- a/app-text/ansifilter/metadata.xml
+++ b/app-text/ansifilter/metadata.xml
@@ -3,5 +3,6 @@
 

kensing...@gentoo.org
+   Michael Palimaka

 

diff --git 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2022-03-04 Thread Sam James
commit: a6f5661ceacd931e1a424377031c5566b84cac11
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  5 00:04:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  5 00:04:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f5661c

sys-apps/apparmor: Stabilize 3.0.1 amd64, #832828

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild 
b/sys-apps/apparmor/apparmor-3.0.1.ebuild
index 1be6bab9fedf..5dd3f3e6c2de 100644
--- a/sys-apps/apparmor/apparmor-3.0.1.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="doc"
 
 RESTRICT="test" # bug 675854



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2022-03-04 Thread Sam James
commit: ae0dc7573664bcdc0ead23496061a216b28fa3f2
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  5 00:04:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  5 00:04:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae0dc757

sys-apps/apparmor-utils: Stabilize 3.0.1 amd64, #832828

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
index 2b76a3e45135..a60091bfffbc 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 
SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2021-11-11 Thread Sam James
commit: 3d1a908aae2b75a99155f9e5b477aa0bbb1433f7
Author: msathieu  outlook  com>
AuthorDate: Wed Nov  3 07:04:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 12 02:08:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1a908a

sys-apps/apparmor-utils: update to 3.0.3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mathieu Strypsteen  outlook.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-3.0.3.ebuild | 87 ++
 2 files changed, 88 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 38571173391..76c9ff7d636 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1 +1,2 @@
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B 
c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129
 SHA512 
e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
+DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B 
aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c
 SHA512 
bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
new file mode 100644
index 000..00aa102d612
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+inherit perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   dev-python/notify2[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   local -x PYTHONDONTWRITEBYTECODE=
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --optimize 2
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2021-11-11 Thread Sam James
commit: 0dded945f9f7223729b7819a76d9d2ce4bfb732c
Author: msathieu  outlook  com>
AuthorDate: Mon Nov  1 17:12:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 12 02:08:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dded945

sys-apps/apparmor: update to 3.0.3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mathieu Strypsteen  outlook.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/Manifest  |  1 +
 sys-apps/apparmor/apparmor-3.0.3.ebuild | 83 +
 2 files changed, 84 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 38571173391..76c9ff7d636 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1,2 @@
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B 
c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129
 SHA512 
e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
+DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B 
aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c
 SHA512 
bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5

diff --git a/sys-apps/apparmor/apparmor-3.0.3.ebuild 
b/sys-apps/apparmor/apparmor-3.0.3.ebuild
new file mode 100644
index 000..4c5fe4d4179
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 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"
+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
+
+   # 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"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/, sys-apps/apparmor/

2021-06-04 Thread Michael Palimaka
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/

2021-06-04 Thread Michael Palimaka
commit: fe314925eda59ccf51c4efbe0da48687085ce08c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jun  4 07:19:51 2021 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jun  4 07:19:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe314925

sys-apps/apparmor: remove 3.0.0

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-3.0.0.ebuild | 72 -
 2 files changed, 73 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index b5b981c8b9f..38571173391 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1 @@
-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-3.0.0.ebuild 
b/sys-apps/apparmor/apparmor-3.0.0.ebuild
deleted file mode 100644
index 36c5b717c4b..000
--- a/sys-apps/apparmor/apparmor-3.0.0.ebuild
+++ /dev/null
@@ -1,72 +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}/${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
-
-   # bug 634782
-   sed -e "s/cpp/$(tc-getCPP) -/" \
-   -i ../common/list_capabilities.sh \
-   -i ../common/list_af_names.sh || 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"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2021-05-31 Thread Michał Górny
commit: ec869a63b8e6e13de8923de410c7403a1332bbd3
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 31 20:58:14 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 31 20:58:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec869a63

sys-apps/apparmor-utils: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  2 -
 .../apparmor-utils/apparmor-utils-2.13.4-r1.ebuild | 86 -
 .../apparmor-utils/apparmor-utils-3.0.0-r1.ebuild  | 88 --
 3 files changed, 176 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index db15b30fede..38571173391 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,3 +1 @@
-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-utils/apparmor-utils-2.13.4-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild
deleted file mode 100644
index 7e3b4f75a91..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-   dev-lang/perl
-   ~sys-libs/libapparmor-${PV}
-   ${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' || die
-
-   sed -i utils/aa-remove-unknown \
-   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   local -x PYTHONDONTWRITEBYTECODE=
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --optimize 2
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   emake install DESTDIR="${D}" USE_SYSTEM=1
-   popd > /dev/null || die
-}

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
deleted file mode 100644
index 80e6fd6100d..000
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2021-05-27 Thread Michael Palimaka
commit: 9a65a8d857f87ed0b80c8b2c736f5c8467194164
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu May 27 08:21:29 2021 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu May 27 08:21:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a65a8d8

sys-apps/apparmor-utils: add python 3.9 support

Bug: https://bugs.gentoo.org/788997
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
index 3ebacd48cc5..2b76a3e4513 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 inherit eapi7-ver perl-module python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2021-02-24 Thread Sam James
commit: f91e6feaf388ba0219ebaf112127111b95e3
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 24 16:27:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 24 16:27:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91e6fea

sys-apps/apparmor: Keyword 3.0.1 arm64, #770871

Signed-off-by: Sam James  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild 
b/sys-apps/apparmor/apparmor-3.0.1.ebuild
index c857b1c46fa..1be6bab9fed 100644
--- a/sys-apps/apparmor/apparmor-3.0.1.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="doc"
 
 RESTRICT="test" # bug 675854



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2020-12-07 Thread Michael Palimaka
commit: bdb27e72011137b381d43288c144e64c84ebe0fb
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Dec  8 06:09:11 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec  8 07:03:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdb27e72

sys-apps/apparmor-utils: version bump 3.0.1

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-3.0.1.ebuild | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 89bb054ab20..db15b30fede 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1,3 @@
 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-utils/apparmor-utils-3.0.1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
new file mode 100644
index 000..7204e752028
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   dev-python/notify2[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   local -x PYTHONDONTWRITEBYTECODE=
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --optimize 2
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2020-12-07 Thread Michael Palimaka
commit: b1d762f55384dd6553ff49965f122a37401f25e1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Dec  8 06:08:54 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec  8 07:03:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d762f5

sys-apps/apparmor: version bump 3.0.1

Closes: https://bugs.gentoo.org/750860
Closes: https://bugs.gentoo.org/758272
Closes: https://bugs.gentoo.org/758272
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/Manifest  |  1 +
 sys-apps/apparmor/apparmor-3.0.1.ebuild | 83 +
 2 files changed, 84 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 89bb054ab20..db15b30fede 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1,3 @@
 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-3.0.1.ebuild 
b/sys-apps/apparmor/apparmor-3.0.1.ebuild
new file mode 100644
index 000..c857b1c46fa
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.1.ebuild
@@ -0,0 +1,83 @@
+# 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}-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
+
+   # 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"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2020-12-03 Thread Michael Palimaka
commit: 5f6331b591341f5e1c3cad49c869af73a9ab6b02
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Dec  3 09:23:00 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Dec  3 09:23:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f6331b5

sys-apps/apparmor-utils: add python 3.8 support

Closes: https://bugs.gentoo.org/758185
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
index 5dceaae3b4d..a1a9c51e194 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit eapi7-ver perl-module python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2020-10-19 Thread Michael Palimaka
commit: 7e172c708f718c5bbdc810800a8b4c41f6e12faa
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Oct 19 09:28:52 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Oct 19 09:29:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e172c70

sys-apps/apparmor-utils: add missing dependencies

Closes: https://bugs.gentoo.org/749834
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Michael Palimaka  gentoo.org>

 .../{apparmor-utils-3.0.0.ebuild => apparmor-utils-3.0.0-r1.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
similarity index 96%
rename from sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild
rename to sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
index fb89112dc69..5dceaae3b4d 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
@@ -33,6 +33,8 @@ RDEPEND="${COMMON_DEPEND}
dev-perl/Locale-gettext
dev-perl/RPC-XML
dev-perl/TermReadKey
+   dev-python/notify2[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
virtual/perl-Data-Dumper
virtual/perl-Getopt-Long"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2020-10-10 Thread Michael Palimaka
commit: 488ef15aefdbbe2b554cf51e4cbfb29c920407f1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Oct 11 04:16:05 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Oct 11 04:16:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488ef15a

sys-apps/apparmor: respect CPP

Closes: https://bugs.gentoo.org/747571
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/apparmor-3.0.0.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/sys-apps/apparmor/apparmor-3.0.0.ebuild 
b/sys-apps/apparmor/apparmor-3.0.0.ebuild
index 662a23505d2..36c5b717c4b 100644
--- a/sys-apps/apparmor/apparmor-3.0.0.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.0.ebuild
@@ -40,6 +40,11 @@ src_prepare() {
# 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() {



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/, sys-apps/apparmor/

2020-10-10 Thread Michael Palimaka
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-utils/

2020-10-10 Thread Michael Palimaka
commit: 6a69d397ea7458814aa27a7164d1dfeba3c888e3
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct 10 09:41:23 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct 10 09:44:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a69d397

sys-apps/apparmor-utils: 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-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-3.0.0.ebuild | 86 ++
 2 files changed, 87 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 6a8b5e50bbe..89bb054ab20 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/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-utils/apparmor-utils-3.0.0.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild
new file mode 100644
index 000..fb89112dc69
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   local -x PYTHONDONTWRITEBYTECODE=
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --optimize 2
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2020-05-07 Thread Michael Palimaka
commit: a73e8eee9da80bd4776fdbf0cf4fc25510ab985b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu May  7 13:40:07 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu May  7 13:40:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73e8eee

sys-apps/apparmor-utils: remove 2.13.3

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 -
 .../apparmor-utils/apparmor-utils-2.13.3.ebuild| 85 --
 2 files changed, 86 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index ac257fe0249..6a8b5e50bbe 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B 
fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346
 SHA512 
137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 
49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4
 SHA512 
d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild
deleted file mode 100644
index 4a6c7fe814c..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-   dev-lang/perl
-   ~sys-libs/libapparmor-${PV}
-   ${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' || die
-
-   sed -i utils/aa-remove-unknown \
-   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --version="${PV}"
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   emake install DESTDIR="${D}" USE_SYSTEM=1
-   popd > /dev/null || die
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2020-05-07 Thread Michael Palimaka
commit: 427a97214d1f46e772ba3d5b0d1864f4a3f461b6
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu May  7 13:40:29 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu May  7 13:40:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427a9721

sys-apps/apparmor-utils: remove 2.13.4-r0

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Palimaka  gentoo.org>

 .../apparmor-utils/apparmor-utils-2.13.4.ebuild| 85 --
 1 file changed, 85 deletions(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.4.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.4.ebuild
deleted file mode 100644
index 4a6c7fe814c..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-   dev-lang/perl
-   ~sys-libs/libapparmor-${PV}
-   ${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' || die
-
-   sed -i utils/aa-remove-unknown \
-   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --version="${PV}"
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   emake install DESTDIR="${D}" USE_SYSTEM=1
-   popd > /dev/null || die
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2020-05-07 Thread Michael Palimaka
commit: f3c8e910157ad4c6b22948c6440c41b68cfb1ec8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu May  7 13:40:56 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu May  7 13:40:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c8e910

sys-apps/apparmor: remove 2.13.3

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/Manifest   |  1 -
 sys-apps/apparmor/apparmor-2.13.3.ebuild | 67 
 2 files changed, 68 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index ac257fe0249..6a8b5e50bbe 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B 
fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346
 SHA512 
137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 
49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4
 SHA512 
d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651

diff --git a/sys-apps/apparmor/apparmor-2.13.3.ebuild 
b/sys-apps/apparmor/apparmor-2.13.3.ebuild
deleted file mode 100644
index a4c693e37c5..000
--- a/sys-apps/apparmor/apparmor-2.13.3.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"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2020-04-21 Thread Michael Palimaka
commit: 581faf5cb87285e09e312857f43c310c62378585
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Apr 21 08:51:16 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Apr 21 08:51:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=581faf5c

sys-apps/apparmor-utils: improve python handling

* Add Python 3.7
* Fix dependencies
* Fix missing byte compilation

Closes: https://bugs.gentoo.org/718514
Package-Manager: Portage-2.3.89, Repoman-2.3.22
Signed-off-by: Michael Palimaka  gentoo.org>

 .../apparmor-utils/apparmor-utils-2.13.4-r1.ebuild | 86 ++
 1 file changed, 86 insertions(+)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild
new file mode 100644
index 000..58da9b5985d
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   local -x PYTHONDONTWRITEBYTECODE=
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --optimize 2
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2020-03-19 Thread Michael Palimaka
commit: a6494e2d9c2d529928c9d1390af9de3f866457f6
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Mar 19 08:19:59 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar 19 08:20:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6494e2d

sys-apps/apparmor-utils: version bump 2.13.4

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-2.13.4.ebuild| 85 ++
 2 files changed, 86 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 696ceaa4e8e..ac257fe0249 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B 
fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346
 SHA512 
137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
+DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 
49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4
 SHA512 
d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.4.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.4.ebuild
new file mode 100644
index 000..4a6c7fe814c
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --version="${PV}"
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2020-03-19 Thread Michael Palimaka
commit: 6167915cbae0c1324fc6c5bdf143ca06cd2d4e21
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Mar 19 08:17:03 2020 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar 19 08:20:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6167915c

sys-apps/apparmor: version bump 2.13.4

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/Manifest   |  1 +
 sys-apps/apparmor/apparmor-2.13.4.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 696ceaa4e8e..ac257fe0249 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B 
fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346
 SHA512 
137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
+DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 
49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4
 SHA512 
d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651

diff --git a/sys-apps/apparmor/apparmor-2.13.4.ebuild 
b/sys-apps/apparmor/apparmor-2.13.4.ebuild
new file mode 100644
index 000..a4c693e37c5
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.13.4.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}/${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"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/

2019-12-02 Thread Michael Palimaka
commit: 728e24213ef6aabb47c60592bb07095e0b2cedf7
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Dec  2 09:27:54 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Dec  2 09:28:50 2019 +
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  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..000
--- 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..000
--- 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 
-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
-



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2019-12-02 Thread Michael Palimaka
commit: 1dc3261d320013e0fe811e5df73c7974119faa94
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Dec  2 09:26:54 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Dec  2 09:28:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc3261d

sys-apps/apparmor-utils: remove 2.13.1

Package-Manager: Portage-2.3.76, Repoman-2.3.18
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 -
 .../apparmor-utils/apparmor-utils-2.13.1.ebuild| 79 --
 2 files changed, 80 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index f99a118d76e..696ceaa4e8e 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/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-utils/apparmor-utils-2.13.1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild
deleted file mode 100644
index 1dec23f3e15..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-DEPEND="
-   dev-lang/perl
-   ~sys-libs/libapparmor-${PV}
-   ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --version="${PV}"
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   emake install DESTDIR="${D}" USE_SYSTEM=1
-   popd > /dev/null || die
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2019-08-18 Thread Michael Palimaka
commit: 091cecc2eacf9b6bf0d1ee43e5b46ee3726059d2
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug 18 08:11:02 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug 18 08:12:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=091cecc2

sys-apps/apparmor: remove 2.13.2

Package-Manager: Portage-2.3.69, Repoman-2.3.17
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/Manifest   |  1 -
 sys-apps/apparmor/apparmor-2.13.2.ebuild | 67 
 2 files changed, 68 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index bf09f795a1e..f99a118d76e 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,3 +1,2 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 
e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
-DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 
1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe
 SHA512 
2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B 
fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346
 SHA512 
137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141

diff --git a/sys-apps/apparmor/apparmor-2.13.2.ebuild 
b/sys-apps/apparmor/apparmor-2.13.2.ebuild
deleted file mode 100644
index 020f3e4ff37..000
--- a/sys-apps/apparmor/apparmor-2.13.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 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"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2019-08-18 Thread Michael Palimaka
commit: 5ae4ad6417381f247d4d782acf9a4bd85a3a96e3
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug 18 08:10:31 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug 18 08:12:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae4ad64

sys-apps/apparmor-utils: remove 2.13.2

Package-Manager: Portage-2.3.69, Repoman-2.3.17
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 -
 .../apparmor-utils/apparmor-utils-2.13.2-r1.ebuild | 85 --
 .../apparmor-utils/apparmor-utils-2.13.2.ebuild| 82 -
 3 files changed, 168 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index bf09f795a1e..f99a118d76e 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,3 +1,2 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 
e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
-DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 
1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe
 SHA512 
2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B 
fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346
 SHA512 
137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
deleted file mode 100644
index 4ce56c968e5..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-   dev-lang/perl
-   ~sys-libs/libapparmor-${PV}
-   ${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' || die
-
-   sed -i utils/aa-remove-unknown \
-   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --version="${PV}"
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   emake install DESTDIR="${D}" USE_SYSTEM=1
-   popd > /dev/null || die
-}

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
deleted file mode 100644
index 7cde6f4759f..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2019-08-06 Thread Michael Palimaka
commit: c91408219de63952e1afdc3465ce79c0a95e771c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Aug  6 11:24:41 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Aug  6 11:26:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9140821

sys-apps/apparmor-utils: version bump 2.13.3

Package-Manager: Portage-2.3.69, Repoman-2.3.17
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-2.13.3.ebuild| 85 ++
 2 files changed, 86 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index e47ad80f147..bf09f795a1e 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1,3 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 
e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 
1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe
 SHA512 
2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
+DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B 
fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346
 SHA512 
137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild
new file mode 100644
index 000..4ce56c968e5
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --version="${PV}"
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2019-08-04 Thread Michael Palimaka
commit: 62a1a7f74e954cabd554233ff62710b5bb6a2367
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug  4 12:26:19 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug  4 12:27:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a1a7f7

sys-apps/apparmor: version bump 2.13.3

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/Manifest   |  1 +
 sys-apps/apparmor/apparmor-2.13.3.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index e47ad80f147..bf09f795a1e 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1,3 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 
e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 
1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe
 SHA512 
2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
+DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B 
fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346
 SHA512 
137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141

diff --git a/sys-apps/apparmor/apparmor-2.13.3.ebuild 
b/sys-apps/apparmor/apparmor-2.13.3.ebuild
new file mode 100644
index 000..020f3e4ff37
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.13.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 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"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/

2019-08-04 Thread Michael Palimaka
commit: f92c71fe9612551098ab97cfb637c9ec2fe56854
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug  4 09:06:37 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug  4 09:07:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92c71fe

sys-apps/apparmor: remove unnecessary executable bit

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/files/apparmor_load.sh   | 0
 sys-apps/apparmor/files/apparmor_unload.sh | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/sys-apps/apparmor/files/apparmor_load.sh 
b/sys-apps/apparmor/files/apparmor_load.sh
old mode 100755
new mode 100644

diff --git a/sys-apps/apparmor/files/apparmor_unload.sh 
b/sys-apps/apparmor/files/apparmor_unload.sh
old mode 100755
new mode 100644



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2019-04-01 Thread Michael Palimaka
commit: 85162cb8427701e7b2eacab3f17278602cbaf9c5
Author: Sergey Alirzaev  gmail  com>
AuthorDate: Sun Mar 31 20:27:31 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Apr  1 10:12:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85162cb8

sys-apps/apparmor-utils: fixed aa-remove-unknown lib path

Closes: https://github.com/gentoo/gentoo/pull/11558
Signed-off-by: Sergey Alirzaev  gmail.com>
Signed-off-by: Michael Palimaka  gentoo.org>

 .../apparmor-utils/apparmor-utils-2.13.2-r1.ebuild | 85 ++
 1 file changed, 85 insertions(+)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
new file mode 100644
index 000..96e9c45f480
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+
+   sed -i utils/aa-remove-unknown \
+   -e 
's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --version="${PV}"
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2019-03-28 Thread Michael Palimaka
commit: e119f775ad1bb6fbff97f68fcc89d15a3880c889
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Mar 28 13:16:48 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar 28 13:17:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e119f775

sys-apps/apparmor-utils: add missing dependency

Closes: https://bugs.gentoo.org/681788
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
index b55e5853dc5..48e17afd736 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
@@ -20,11 +20,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 
-DEPEND="
+COMMON_DEPEND="
dev-lang/perl
~sys-libs/libapparmor-${PV}
${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
~sys-libs/libapparmor-${PV}[perl,python]
~sys-apps/apparmor-${PV}
dev-perl/Locale-gettext



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2019-03-28 Thread Michael Palimaka
commit: 18ea30bfa215fdc18e982b9fe8b18caa5db416e8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Mar 28 13:15:44 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar 28 13:17:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ea30bf

sys-apps/apparmor: add missing dependency

Closes: https://bugs.gentoo.org/681788
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/apparmor-2.13.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/apparmor/apparmor-2.13.2.ebuild 
b/sys-apps/apparmor/apparmor-2.13.2.ebuild
index d9da4e02a2c..020f3e4ff37 100644
--- a/sys-apps/apparmor/apparmor-2.13.2.ebuild
+++ b/sys-apps/apparmor/apparmor-2.13.2.ebuild
@@ -22,6 +22,7 @@ RDEPEND="~sys-libs/libapparmor-${PV}"
 DEPEND="${RDEPEND}
dev-lang/perl
sys-devel/bison
+   sys-devel/gettext
sys-devel/flex
doc? ( dev-tex/latex2html )
 "



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2019-03-25 Thread Michael Palimaka
commit: 7541113ca1a32bbdd2c7850516f3b50684f5ec8b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Mar 25 11:37:28 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Mar 25 11:38:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7541113c

sys-apps/apparmor: restrict tests

Tests require AppArmor support to be enabled in the kernel.

Closes: https://bugs.gentoo.org/675854
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/apparmor-2.13.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-apps/apparmor/apparmor-2.13.2.ebuild 
b/sys-apps/apparmor/apparmor-2.13.2.ebuild
index dbf262c1ac6..d9da4e02a2c 100644
--- a/sys-apps/apparmor/apparmor-2.13.2.ebuild
+++ b/sys-apps/apparmor/apparmor-2.13.2.ebuild
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
+RESTRICT="test" # bug 675854
+
 RDEPEND="~sys-libs/libapparmor-${PV}"
 DEPEND="${RDEPEND}
dev-lang/perl



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2019-03-07 Thread Michael Palimaka
commit: 82f6ec280eb14b073c89b1afa365ac026423ebb7
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Mar  7 11:27:00 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar  7 11:27:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f6ec28

sys-apps/apparmor-utils: version bump 2.13.2

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-2.13.2.ebuild| 79 ++
 2 files changed, 80 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index af8cbc892af..e47ad80f147 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 
e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
+DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 
1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe
 SHA512 
2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
new file mode 100644
index 000..b55e5853dc5
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --version="${PV}"
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2019-03-07 Thread Michael Palimaka
commit: 29744586d9226768267cc832a4ee5517225662b8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Mar  7 11:26:02 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar  7 11:27:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29744586

sys-apps/apparmor: version bump 2.13.2

Closes: https://bugs.gentoo.org/677082
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/Manifest   |  1 +
 sys-apps/apparmor/apparmor-2.13.2.ebuild | 64 
 2 files changed, 65 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index af8cbc892af..e47ad80f147 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 
e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
+DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 
1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe
 SHA512 
2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f

diff --git a/sys-apps/apparmor/apparmor-2.13.2.ebuild 
b/sys-apps/apparmor/apparmor-2.13.2.ebuild
new file mode 100644
index 000..dbf262c1ac6
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.13.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 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"
+)
+
+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"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2019-03-07 Thread Michael Palimaka
commit: 2c26acc36d51e280930b530943ca1fd836d96097
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Mar  7 11:00:39 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar  7 11:03:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c26acc3

sys-apps/apparmor-utils: remove 2.12.0

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 -
 .../apparmor-utils/apparmor-utils-2.12.0.ebuild| 77 --
 2 files changed, 78 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 1556178a53f..af8cbc892af 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 
e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.12.0.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.12.0.ebuild
deleted file mode 100644
index baac5662c9d..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.12.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit perl-module python-r1 toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${MY_PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-DEPEND="dev-lang/perl
-   ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${MY_PV}
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --version="${PV}"
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   emake install DESTDIR="${D}" USE_SYSTEM=1
-   popd > /dev/null || die
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/

2019-03-07 Thread Michael Palimaka
commit: 7cb99f95b6efeb2bea7575699ff1cb1e77481483
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Mar  7 11:02:25 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar  7 11:03:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb99f95

sys-apps/apparmor: remove 2.12.0 and 2.13.1-r0

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/Manifest |  1 -
 sys-apps/apparmor/apparmor-2.12.0.ebuild   | 64 --
 sys-apps/apparmor/apparmor-2.13.1.ebuild   | 64 --
 .../apparmor/files/apparmor-2.10-makefile.patch| 25 -
 4 files changed, 154 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 1556178a53f..af8cbc892af 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 
e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7

diff --git a/sys-apps/apparmor/apparmor-2.12.0.ebuild 
b/sys-apps/apparmor/apparmor-2.12.0.ebuild
deleted file mode 100644
index 03c5bca122b..000
--- a/sys-apps/apparmor/apparmor-2.12.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application 
security system"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${MY_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-${MY_PV}/parser
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.10-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/apparmor-2.13.1.ebuild 
b/sys-apps/apparmor/apparmor-2.13.1.ebuild
deleted file mode 100644
index fad630e257f..000
--- a/sys-apps/apparmor/apparmor-2.13.1.ebuild
+++ /dev/null
@@ -1,64 +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"
-)
-
-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 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/

2018-11-25 Thread Michael Palimaka
commit: d17bd7b6d3871a0ab6a9af8d42bc1a222d1c50b7
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Nov 25 10:31:51 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Nov 25 10:32:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17bd7b6

sys-apps/apparmor: backport patch from upstream fixing syntax error

Closes: https://bugs.gentoo.org/671426
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/apparmor-2.13.1-r1.ebuild| 65 ++
 .../apparmor/files/apparmor-2.13.1-syntax.patch| 29 ++
 2 files changed, 94 insertions(+)

diff --git a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild 
b/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild
new file mode 100644
index 000..b14dc3e4420
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild
@@ -0,0 +1,65 @@
+# 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
new file mode 100644
index 000..b09d7800dec
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch
@@ -0,0 +1,29 @@
+From 3bf11cee3eceacb7f3ec177fb676ba36f373d369 Mon Sep 17 00:00:00 2001
+From: Christian Boltz 
+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
+



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/, sys-apps/apparmor/, sys-apps/apparmor/files/

2018-11-09 Thread Michael Palimaka
commit: fa4f8db15c3280fd40d14cf325a5b99ea4051faa
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Nov  9 10:01:02 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Nov  9 10:08:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4f8db1

sys-apps/apparmor: version bump 2.13.1

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-2.13.1.ebuild| 79 ++
 sys-apps/apparmor/Manifest |  1 +
 sys-apps/apparmor/apparmor-2.13.1.ebuild   | 64 ++
 .../apparmor/files/apparmor-2.13.1-makefile.patch  | 25 +++
 5 files changed, 170 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 0a6a3ee99d9..1556178a53f 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
+DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 
e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild
new file mode 100644
index 000..0407708f4d8
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+DEPEND="
+   dev-lang/perl
+   ~sys-libs/libapparmor-${PV}
+   ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --version="${PV}"
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 0a6a3ee99d9..1556178a53f 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
+DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 
34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/files/, sys-apps/apparmor-utils/

2018-11-09 Thread Michael Palimaka
commit: bef2e69aa258bede81195893d4b9f8846ce1565c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Nov  9 08:54:51 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Nov  9 08:56:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bef2e69a

sys-apps/apparmor-utils: remove 2.11.1

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor-utils/Manifest   |  1 -
 .../apparmor-utils/apparmor-utils-2.11.1.ebuild| 82 --
 .../files/apparmor-utils-2.11-shebang.patch| 16 -
 3 files changed, 99 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 10e4fbc530b..0a6a3ee99d9 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B 
ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e
 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
 DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild
deleted file mode 100644
index 310ca84e60e..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit perl-module python-r1 toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-DEPEND="dev-lang/perl
-   ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.11-shebang.patch"
-)
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' \
-   -e 's/EXTRA_CFLAGS = /& ${CFLAGS}/' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --version="${PV}"
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   emake install DESTDIR="${D}" USE_SYSTEM=1
-   popd > /dev/null || die
-}

diff --git a/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch 
b/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch
deleted file mode 100644
index 3dce7c26168..000
--- a/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid rewriting the shebang.
-
-The ebuild will take care of this when replicating the script for each of the
-supported python implementations.
-
 a/utils/python-tools-setup.py
-+++ b/utils/python-tools-setup.py
-@@ -43,7 +43,7 @@
- f = prefix + s
- # If we have a defined python version, use it instead of the 
system
- # default
--if 'PYTHON' in os.environ:
-+if False:
- lines = 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2018-11-09 Thread Michael Palimaka
commit: 6f10b8f0f820d1349e3d4c4fec14cd750fe63526
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Nov  9 08:55:28 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Nov  9 08:56:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f10b8f0

sys-apps/apparmor: remove 2.11.1

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 sys-apps/apparmor/Manifest  |  1 -
 sys-apps/apparmor/apparmor-2.11.1-r2.ebuild | 64 -
 2 files changed, 65 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 10e4fbc530b..0a6a3ee99d9 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B 
ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e
 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
 DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a

diff --git a/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild 
b/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
deleted file mode 100644
index 1d78904b577..000
--- a/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application 
security system"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${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.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"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2017-12-31 Thread Michael Palimaka
commit: 4752cb4e48f96b7a29b0d4fd052fa85602e88228
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jan  1 02:51:41 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jan  1 02:59:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4752cb4e

sys-apps/apparmor: version bump 2.12.0

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 sys-apps/apparmor/Manifest   |  1 +
 sys-apps/apparmor/apparmor-2.12.0.ebuild | 64 
 2 files changed, 65 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index fa2e8344639..10e4fbc530b 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B 
ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e
 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
+DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a

diff --git a/sys-apps/apparmor/apparmor-2.12.0.ebuild 
b/sys-apps/apparmor/apparmor-2.12.0.ebuild
new file mode 100644
index 000..03c5bca122b
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application 
security system"
+HOMEPAGE="http://apparmor.net/;
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${MY_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-${MY_PV}/parser
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.10-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"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2017-12-31 Thread Michael Palimaka
commit: c746c92df9249005ec773c1540d2d015011144b8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jan  1 02:50:13 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jan  1 02:59:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c746c92d

sys-apps/apparmor: remove 2.11.1-r1

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 sys-apps/apparmor/apparmor-2.11.1-r1.ebuild | 59 -
 1 file changed, 59 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-2.11.1-r1.ebuild 
b/sys-apps/apparmor/apparmor-2.11.1-r1.ebuild
deleted file mode 100644
index eb164b45cf3..000
--- a/sys-apps/apparmor/apparmor-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application 
security system"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${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.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}
-
-   use doc && dodoc techdoc.pdf
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2017-12-31 Thread Michael Palimaka
commit: aba7f7d9192d9f80d1863690fe8338d1691e0f4f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jan  1 02:58:49 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jan  1 02:59:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba7f7d9

sys-apps/apparmor-utils: version bump 2.12.0

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-2.12.0.ebuild| 77 ++
 2 files changed, 78 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index fa2e8344639..10e4fbc530b 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B 
ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e
 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
+DIST apparmor-2.12.tar.gz 7258450 BLAKE2B 
c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c
 SHA512 
d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.12.0.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.12.0.ebuild
new file mode 100644
index 000..baac5662c9d
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.12.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit perl-module python-r1 toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="http://apparmor.net/;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${MY_PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+DEPEND="dev-lang/perl
+   ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${MY_PV}
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --version="${PV}"
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/

2017-12-07 Thread Michael Palimaka
commit: 01417d76965fc9cb35171e72694562c71da537c5
Author: Reuben D'Netto  gmail  com>
AuthorDate: Wed Dec  6 11:12:46 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Dec  7 09:49:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01417d76

sys-apps/apparmor: Added systemd unit.

Closes: https://bugs.gentoo.org/555388
Closes: https://github.com/gentoo/gentoo/pull/6466

 sys-apps/apparmor/Manifest  |  2 +-
 sys-apps/apparmor/apparmor-2.11.1-r2.ebuild | 64 +
 sys-apps/apparmor/files/apparmor.service| 14 +++
 sys-apps/apparmor/files/apparmor_load.sh|  2 +
 sys-apps/apparmor/files/apparmor_unload.sh  |  2 +
 5 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index a2e9f8fdb80..fa2e8344639 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1 @@
-DIST apparmor-2.11.1.tar.gz 5017646 SHA256 
e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
 WHIRLPOOL 
46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e
+DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B 
ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e
 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c

diff --git a/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild 
b/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
new file mode 100644
index 000..1d78904b577
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application 
security system"
+HOMEPAGE="http://apparmor.net/;
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${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.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.service 
b/sys-apps/apparmor/files/apparmor.service
new file mode 100644
index 000..89f14fed4b7
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=AppArmor profiles
+DefaultDependencies=no
+After=local-fs.target
+Before=sysinit.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/share/apparmor/apparmor_load.sh
+ExecStop=/usr/share/apparmor/apparmor_unload.sh
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

diff --git a/sys-apps/apparmor/files/apparmor_load.sh 
b/sys-apps/apparmor/files/apparmor_load.sh
new file mode 100755
index 000..e6fe6b68431
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor_load.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -r {} +

diff --git a/sys-apps/apparmor/files/apparmor_unload.sh 
b/sys-apps/apparmor/files/apparmor_unload.sh
new file mode 100755
index 000..19e598bb84c
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor_unload.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -R {} \;



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/

2017-11-03 Thread Michael Palimaka
commit: 5b96d60bb673a66c941bce924f14334ca7e5659e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Nov  3 13:58:57 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Nov  3 13:59:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b96d60b

sys-apps/apparmor: remove 2.11.0

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 sys-apps/apparmor/Manifest |  1 -
 sys-apps/apparmor/apparmor-2.11.0.ebuild   | 59 --
 .../files/apparmor-2.10-dynamic-link.patch | 12 -
 3 files changed, 72 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 5a2383ffc95..a2e9f8fdb80 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.11.0.tar.gz 5013297 SHA256 
b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 
86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55
 WHIRLPOOL 
2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
 DIST apparmor-2.11.1.tar.gz 5017646 SHA256 
e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
 WHIRLPOOL 
46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e

diff --git a/sys-apps/apparmor/apparmor-2.11.0.ebuild 
b/sys-apps/apparmor/apparmor-2.11.0.ebuild
deleted file mode 100644
index 99787fd94be..000
--- a/sys-apps/apparmor/apparmor-2.11.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application 
security system"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_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_test() {
-   emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-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
deleted file mode 100644
index 24263d0892b..000
--- a/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 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
-



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2017-11-03 Thread Michael Palimaka
commit: 8b10f725d76f73fcf92deb1227836f29101fe04c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Nov  3 13:58:29 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Nov  3 13:59:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b10f725

sys-apps/apparmor-utils: remove 2.11.0-r1

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 sys-apps/apparmor-utils/Manifest   |  1 -
 .../apparmor-utils/apparmor-utils-2.11.0-r1.ebuild | 82 --
 2 files changed, 83 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 5a2383ffc95..a2e9f8fdb80 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.11.0.tar.gz 5013297 SHA256 
b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 
86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55
 WHIRLPOOL 
2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
 DIST apparmor-2.11.1.tar.gz 5017646 SHA256 
e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
 WHIRLPOOL 
46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
deleted file mode 100644
index 8d9f092107e..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit perl-module python-r1 toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-DEPEND="dev-lang/perl
-   ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.11-shebang.patch"
-)
-
-src_prepare() {
-   default
-
-   sed -i binutils/Makefile \
-   -e 's/Bstatic/Bdynamic/g' \
-   -e 's/EXTRA_CFLAGS = /& ${CFLAGS}/' || die
-}
-
-src_compile() {
-   python_setup
-
-   pushd utils > /dev/null || die
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   export EXTRA_CFLAGS="${CFLAGS}"
-   emake CC="$(tc-getCC)" USE_SYSTEM=1
-   popd > /dev/null || die
-}
-
-src_install() {
-   pushd utils > /dev/null || die
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
-   --root="${D}" --version="${PV}"
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-   popd > /dev/null || die
-
-   pushd binutils > /dev/null || die
-   emake install DESTDIR="${D}" USE_SYSTEM=1
-   popd > /dev/null || die
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2017-10-31 Thread Michael Palimaka
commit: 01dab293acf4c1c779814b9a0b098a207b306ba1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Oct 31 12:21:59 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Oct 31 12:22:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01dab293

sys-apps/apparmor: revision bump resolves automagic distro detection

The automagic distro detection caused different files to be installed, for
example if /usr/bin/rpm was present.

Closes: https://bugs.gentoo.org/635908
Package-Manager: Portage-2.3.8, Repoman-2.3.4

 .../apparmor/{apparmor-2.11.1.ebuild => apparmor-2.11.1-r1.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-2.11.1.ebuild 
b/sys-apps/apparmor/apparmor-2.11.1-r1.ebuild
similarity index 93%
rename from sys-apps/apparmor/apparmor-2.11.1.ebuild
rename to sys-apps/apparmor/apparmor-2.11.1-r1.ebuild
index ce5c3943dfd..eb164b45cf3 100644
--- a/sys-apps/apparmor/apparmor-2.11.1.ebuild
+++ b/sys-apps/apparmor/apparmor-2.11.1-r1.ebuild
@@ -49,12 +49,11 @@ src_test() {
 }
 
 src_install() {
-   emake DESTDIR="${D}" USE_SYSTEM=1 install
+   emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
 
dodir /etc/apparmor.d/disable
 
newinitd "${FILESDIR}"/${PN}-init ${PN}
-   rm "${D}"/etc/init.d/boot.apparmor || die
 
use doc && dodoc techdoc.pdf
 }



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/

2017-10-30 Thread Michael Palimaka
commit: 9ffa8736aeb1da843ad06f5514fe068f90263f51
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Oct 30 12:45:18 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Oct 30 12:52:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ffa8736

sys-apps/apparmor: version bump 2.11.1

This resolves CVE-2017-6507.

Bug: https://bugs.gentoo.org/635888
Package-Manager: Portage-2.3.8, Repoman-2.3.4

 sys-apps/apparmor/Manifest |  1 +
 sys-apps/apparmor/apparmor-2.11.1.ebuild   | 60 ++
 .../files/apparmor-2.11.1-dynamic-link.patch   | 11 
 3 files changed, 72 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index b3f6af57495..5a2383ffc95 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.11.0.tar.gz 5013297 SHA256 
b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 
86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55
 WHIRLPOOL 
2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
+DIST apparmor-2.11.1.tar.gz 5017646 SHA256 
e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
 WHIRLPOOL 
46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e

diff --git a/sys-apps/apparmor/apparmor-2.11.1.ebuild 
b/sys-apps/apparmor/apparmor-2.11.1.ebuild
new file mode 100644
index 000..ce5c3943dfd
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.11.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application 
security system"
+HOMEPAGE="http://apparmor.net/;
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${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.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}" USE_SYSTEM=1 install
+
+   dodir /etc/apparmor.d/disable
+
+   newinitd "${FILESDIR}"/${PN}-init ${PN}
+   rm "${D}"/etc/init.d/boot.apparmor || die
+
+   use doc && dodoc techdoc.pdf
+}

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
new file mode 100644
index 000..bde21c30e70
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-2.11.1-dynamic-link.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
 b/Makefile
+@@ -87,7 +87,7 @@
+ AAREOBJECT = ${AAREDIR}/libapparmor_re.a
+ AAREOBJECTS = $(AAREOBJECT)
+ AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS)
+-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



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2017-10-30 Thread Michael Palimaka
commit: 549d9087831797bf018b63d904411bb61d4372f9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Oct 30 12:46:50 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Oct 30 12:52:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549d9087

sys-apps/apparmor-utils: version bump 2.11.1

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 sys-apps/apparmor-utils/Manifest   |  1 +
 .../apparmor-utils/apparmor-utils-2.11.1.ebuild| 82 ++
 2 files changed, 83 insertions(+)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index b3f6af57495..5a2383ffc95 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.11.0.tar.gz 5013297 SHA256 
b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 
86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55
 WHIRLPOOL 
2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
+DIST apparmor-2.11.1.tar.gz 5017646 SHA256 
e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 
f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
 WHIRLPOOL 
46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild
new file mode 100644
index 000..310ca84e60e
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit perl-module python-r1 toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
+HOMEPAGE="http://apparmor.net/;
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+DEPEND="dev-lang/perl
+   ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+   ~sys-libs/libapparmor-${PV}[perl,python]
+   ~sys-apps/apparmor-${PV}
+   dev-perl/Locale-gettext
+   dev-perl/RPC-XML
+   dev-perl/TermReadKey
+   virtual/perl-Data-Dumper
+   virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.11-shebang.patch"
+)
+
+src_prepare() {
+   default
+
+   sed -i binutils/Makefile \
+   -e 's/Bstatic/Bdynamic/g' \
+   -e 's/EXTRA_CFLAGS = /& ${CFLAGS}/' || die
+}
+
+src_compile() {
+   python_setup
+
+   pushd utils > /dev/null || die
+   # launches non-make subprocesses causing "make jobserver unavailable"
+   # error messages to appear in generated code
+   emake -j1
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   export EXTRA_CFLAGS="${CFLAGS}"
+   emake CC="$(tc-getCC)" USE_SYSTEM=1
+   popd > /dev/null || die
+}
+
+src_install() {
+   pushd utils > /dev/null || die
+   perl_set_version
+   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+   install_python() {
+   "${PYTHON}" "${S}"/utils/python-tools-setup.py install 
--prefix=/usr \
+   --root="${D}" --version="${PV}"
+   }
+
+   python_foreach_impl install_python
+   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
+   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+   popd > /dev/null || die
+
+   pushd binutils > /dev/null || die
+   emake install DESTDIR="${D}" USE_SYSTEM=1
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/

2017-08-05 Thread Michael Palimaka
commit: a841aa9d4a1022eea2e83e110e4065e43a726c47
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Aug  5 07:58:52 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Aug  5 07:58:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a841aa9d

sys-apps/apparmor: fix tests

Gentoo-bug: 625448
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sys-apps/apparmor/apparmor-2.11.0.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/apparmor/apparmor-2.11.0.ebuild 
b/sys-apps/apparmor/apparmor-2.11.0.ebuild
index 4506271eadc..99787fd94be 100644
--- a/sys-apps/apparmor/apparmor-2.11.0.ebuild
+++ b/sys-apps/apparmor/apparmor-2.11.0.ebuild
@@ -44,6 +44,10 @@ src_compile()  {
use doc && emake pdf
 }
 
+src_test() {
+   emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
 src_install() {
emake DESTDIR="${D}" USE_SYSTEM=1 install
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2017-06-18 Thread Pacho Ramos
commit: ebaeaecefb2905e6e210591e17dab60ec9abf323
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun 18 09:04:52 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun 18 09:05:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebaeaece

sys-apps/apparmor-utils: Support newer python

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
index 9fa4c41e009..8d9f092107e 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit perl-module python-r1 toolchain-funcs versionator
 
 MY_PV="$(get_version_component_range 1-2)"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/

2017-06-17 Thread Michael Palimaka
commit: 6e062d789d69666ff1e576e23bda988657772feb
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun 18 05:54:39 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 18 05:55:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e062d78

sys-apps/apparmor-utils: restrict tests

As the ebuild is now, the test phase does nothing but dies. While attempting to
fix the test phase, I discovered that the tests attempt to call python2 while
this package has only python3 in PYTHON_COMPAT (because the scripts that are
actually installed are no longer python2-compatible). Python wrapper does not
allow this, so the test phase has to be restricted.

Gentoo-bug: 621844
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
index 195fd986749..9fa4c41e009 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
@@ -18,6 +18,8 @@ KEYWORDS="~amd64"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RESTRICT="test"
+
 DEPEND="dev-lang/perl
${PYTHON_DEPS}"
 RDEPEND="${DEPEND}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/, sys-apps/apparmor-utils/files/

2017-06-03 Thread Michael Palimaka
commit: 99bd8e36839e36b37717a5c1ba411940010dc85f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jun  3 12:51:56 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jun  3 12:53:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99bd8e36

sys-apps/apparmor-utils: remove 2.10.1 and 2.11.0-r0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/apparmor-utils/Manifest   |  1 -
 .../apparmor-utils/apparmor-utils-2.10.1.ebuild| 57 -
 .../apparmor-utils/apparmor-utils-2.11.0.ebuild| 59 --
 .../files/apparmor-utils-2.10-shebang.patch| 16 --
 4 files changed, 133 deletions(-)

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index c564ea3a69c..b3f6af57495 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.10.1.tar.gz 4494037 SHA256 
07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512 
93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278
 WHIRLPOOL 
d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25
 DIST apparmor-2.11.0.tar.gz 5013297 SHA256 
b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 
86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55
 WHIRLPOOL 
2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.10.1.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.10.1.ebuild
deleted file mode 100644
index 626d63b7121..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.10.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-inherit perl-module python-r1 versionator
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/apparmor/$(get_version_component_range 
1-2)/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-lang/perl
-   ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}/utils
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.10-shebang.patch"
-)
-
-src_compile() {
-   python_setup
-
-   # launches non-make subprocesses causing "make jobserver unavailable"
-   # error messages to appear in generated code
-   emake -j1
-}
-
-src_install() {
-   perl_set_version
-   emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-   VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-   install_python() {
-   "${PYTHON}" "${S}"/python-tools-setup.py install --prefix=/usr \
-   --root="${D}" --version="${PV}"
-   }
-
-   python_foreach_impl install_python
-   python_replicate_script "${D}"/usr/bin/aa-easyprof 
"${D}"/usr/sbin/apparmor_status \
-   
"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-}

diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.0.ebuild 
b/sys-apps/apparmor-utils/apparmor-utils-2.11.0.ebuild
deleted file mode 100644
index fbd4daeaa6e..000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.11.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 )
-inherit perl-module python-r1 versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile 
management"
-HOMEPAGE="http://apparmor.net/;
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-lang/perl
-   ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-   ~sys-libs/libapparmor-${PV}[perl,python]
-   ~sys-apps/apparmor-${PV}
-   dev-perl/Locale-gettext
-   dev-perl/RPC-XML
-   dev-perl/TermReadKey
-   virtual/perl-Data-Dumper
-   virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}/utils
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.10-shebang.patch"
-)
-
-src_compile() {
-   

  1   2   >