diff options
Diffstat (limited to 'sys-apps/apparmor-utils')
| -rw-r--r-- | sys-apps/apparmor-utils/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild (renamed from sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild) | 42 | ||||
| -rw-r--r-- | sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild (renamed from sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild) | 22 | ||||
| -rw-r--r-- | sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild | 79 | ||||
| -rw-r--r-- | sys-apps/apparmor-utils/metadata.xml | 6 |
5 files changed, 117 insertions, 37 deletions
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest index f99a118d76e4..86b70cba9120 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.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141 +DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20 SHA512 94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762 +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-2.13.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild index 1dec23f3e152..fe4d9767c5dd 100644 --- a/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild +++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -PYTHON_COMPAT=( python3_{5,6} ) -inherit eapi7-ver perl-module python-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{10..11} ) +inherit python-r1 toolchain-funcs MY_PV="$(ver_cut 1-2)" @@ -14,24 +14,22 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm64 ~riscv" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" -DEPEND=" - dev-lang/perl +COMMON_DEPEND=" ~sys-libs/libapparmor-${PV} ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - ~sys-libs/libapparmor-${PV}[perl,python] +DEPEND="${COMMON_DEPEND} + sys-devel/gettext +" +RDEPEND="${COMMON_DEPEND} + ~sys-libs/libapparmor-${PV}[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" + dev-python/notify2[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}]" S=${WORKDIR}/apparmor-${PV} @@ -40,6 +38,9 @@ src_prepare() { 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() { @@ -59,18 +60,17 @@ 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= "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ - --root="${D}" --version="${PV}" + --root="${D}" --optimize 2 --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} + 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 diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild index 4ce56c968e57..7b0f7036c5aa 100644 --- a/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild +++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -PYTHON_COMPAT=( python3_{5,6} ) -inherit eapi7-ver perl-module python-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{9..11} ) +inherit perl-module python-r1 toolchain-funcs MY_PV="$(ver_cut 1-2)" @@ -14,8 +14,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm64 ~riscv" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" @@ -28,11 +27,13 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext " RDEPEND="${COMMON_DEPEND} - ~sys-libs/libapparmor-${PV}[perl,python] + ~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" @@ -70,13 +71,14 @@ src_install() { 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}" --version="${PV}" + --root="${D}" --optimize 2 --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} + 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 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 new file mode 100644 index 000000000000..a154b882fce2 --- /dev/null +++ b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit 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 ~ppc64 ~riscv" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="test" + +COMMON_DEPEND=" + ~sys-libs/libapparmor-${PV} + ${PYTHON_DEPS}" +DEPEND="${COMMON_DEPEND} + sys-devel/gettext +" +RDEPEND="${COMMON_DEPEND} + ~sys-libs/libapparmor-${PV}[python,${PYTHON_USEDEP}] + ~sys-apps/apparmor-${PV} + dev-python/notify2[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}]" + +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 + emake DESTDIR="${D}" 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 +} diff --git a/sys-apps/apparmor-utils/metadata.xml b/sys-apps/apparmor-utils/metadata.xml index 42d1e8f65243..32fae81e7e61 100644 --- a/sys-apps/apparmor-utils/metadata.xml +++ b/sys-apps/apparmor-utils/metadata.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>kensington@gentoo.org</email> - </maintainer> <maintainer type="project"> <email>hardened@gentoo.org</email> <name>Gentoo Hardened</name> </maintainer> <upstream> <remote-id type="launchpad">apparmor</remote-id> + <remote-id type="gitlab">apparmor/apparmor</remote-id> </upstream> </pkgmetadata> |