From edf2020faee7afc376fce2d8cd68232bb08553bb Mon Sep 17 00:00:00 2001 From: Thibaud CANALE Date: Sat, 24 Oct 2026 16:31:25 +0200 Subject: [PATCH] sys-apps/apparmor-utils: add 4.1.8, enable test suite, add verify-sig Closes: https://bugs.gentoo.org/984760 Signed-off-by: Thibaud CANALE Part-of: https://github.com/gentoo/gentoo/pull/46943 Signed-off-by: Sam James --- sys-apps/apparmor-utils/Manifest | 2 + .../apparmor-utils-4.1.8.ebuild | 124 ++++++++++++++++++ ...mor-utils-4.1.8_disable_faulty_tests.patch | 52 ++++++++ 3 files changed, 178 insertions(+) create mode 100644 sys-apps/apparmor-utils/apparmor-utils-4.1.8.ebuild create mode 100644 sys-apps/apparmor-utils/files/apparmor-utils-4.1.8_disable_faulty_tests.patch diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest index cb66ab52aabaa..923eca26a9176 100644 --- a/sys-apps/apparmor-utils/Manifest +++ b/sys-apps/apparmor-utils/Manifest @@ -1,5 +1,7 @@ DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4 DIST apparmor-4.0.3.tar.gz 8211339 BLAKE2B 715391a1fc0fb57b820a8bcebdc76ae96e436a29546b9c47019f10f4d22942431ba5c878d92bb61b47ff17012e026195b8d7d78a329cc1cc182a31bc3b512e63 SHA512 8b1240ec56fe4f987edcda9380de685e36f4ac931772e980a8f3655dfbfd7e337a4b15227c7ceecb87d9a2bb592e466ec39912ef8f2fa59f8802464d72df8da2 DIST apparmor-v4.1.7.tar.bz2 5861899 BLAKE2B 00f881cbe989a686fbc7c0f6178b8b1892767378bb8da79a4656a8abfb222212037751e7c2ce2ca558c1ca2398684452ad10056b7e3eb1dd354155dbe688f78d SHA512 ac39de21042be5c85c1cac07082444772b506e0701ec0d3300d5515f14b3673a485ab37aeb38e3533a236b03ecf9a0e1032bbdd296e878e68b93472ebc8fd1ae +DIST apparmor-v4.1.8.tar.bz2 5863730 BLAKE2B 168c8a28b6fd54e18177b2da99f4d71a0876340d3a3b43ec3370e0087b2d6156ca10af00bbed948ec1547e34b0acf81a0acd7aa37724a7a493986f8b40e17adf SHA512 7baea723ff0488a28ea74c193e8324daacd07d0ea6e090eeb4886a34c50f35c7f8181ad45cf20a09a1c1e30e67db8140927ae75eb75c76146944ca79e87844a0 +DIST apparmor-v4.1.8.tar.bz2.asc 870 BLAKE2B 58ad5b4034b4629a6228c0f0b753e7d73f3a1cecbe29659b3a4f892aa63ad20c6cfd4b55bf519c1dc10416f901ba1b9c33dcf59e6c2ac17c2254916b67be92fc SHA512 b45d0893d821caba4ea2e48bc3f7ac2c0ce561f75680d0a3473c66bf844e8969735c33fedb4aa85ea668469371b96ee9c54719c4ec7186d792c770164112add1 DIST apparmor-v5.0.2.tar.bz2 6293121 BLAKE2B 343b5d4dadc7795ad78874c09f254e0b2dc3dbffdc7c3f085baeba1fab26e546e78a146975d98dd8865f5186219f3b80dc676d0e95498b3f54ceab98368109e8 SHA512 a0f3f7df108a10cada3872bc3bd89f5f7c3d4585eab1672f235122b2194617d86b3484e9a965a87286995c274aa81df5ca62a0df8e07ea19fda2e4eda8443493 DIST apparmor-v5.0.2.tar.bz2.asc 870 BLAKE2B 623a1b2d8423bc574d5bc6df5dc9548c87d9750fd393a2ac94a7aa5f9fdef744448e7b06446bf7ac905522243b5f629cc987435c84beb5c59b4718f223c28dc6 SHA512 044a1e87c7613bd924d4d7292e3f7f7bf54ae7f5527bb250c78348dacdf8526f72f8f04de5ed16ef1e105d138c1e550eb47369169d2a65fe3c8732cac62ea80e diff --git a/sys-apps/apparmor-utils/apparmor-utils-4.1.8.ebuild b/sys-apps/apparmor-utils/apparmor-utils-4.1.8.ebuild new file mode 100644 index 0000000000000..cd61dd69a61a1 --- /dev/null +++ b/sys-apps/apparmor-utils/apparmor-utils-4.1.8.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{12..15} ) + +inherit desktop distutils-r1 toolchain-funcs verify-sig + +DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/-/wikis/home" +SRC_URI=" + https://gitlab.com/apparmor/apparmor/-/archive/v${PV}/apparmor-v${PV}.tar.bz2 + verify-sig? ( + https://gitlab.com/api/v4/projects/4484878/packages/generic/signatures/${PV}/apparmor-v${PV}.tar.bz2.asc + ) +" + +S=${WORKDIR}/apparmor-v${PV} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND=" + ~sys-libs/libapparmor-${PV} + ${PYTHON_DEPS} +" +DEPEND=" + ${COMMON_DEPEND} + sys-devel/gettext +" +RDEPEND=" + ${COMMON_DEPEND} + dev-python/notify2[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + ~sys-apps/apparmor-${PV} + ~sys-libs/libapparmor-${PV}[python,${PYTHON_USEDEP}] +" +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-apparmor ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/apparmor.asc + +PATCHES=( + "${FILESDIR}/apparmor-utils-4.1.8_disable_faulty_tests.patch" +) + +# Test campaign is not 100%, it requires more fixing, see patching. +distutils_enable_tests unittest + +src_prepare() { + distutils-r1_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 + + # Remove extra tests, also see patch + local target + local testcases_multi=( + change_onexec_gl636 + change_onexec_lp1648143 + file_without_filename + posix_mqueue_disconnected_no_name + testcase_changeprofile_03 + ) + for target in "${testcases_multi[@]}"; do + rm -f libraries/libapparmor/testsuite/test_multi/"${target}".{err,in,out,profile} + done +} + +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 +} + +python_test() { + pushd utils > /dev/null || die + emake USE_SYSTEM=1 PYFLAKES=true check + popd > /dev/null || die +} + +python_install() { + local -x PYTHONDONTWRITEBYTECODE= + "${PYTHON}" python-tools-setup.py install \ + --prefix="${EPREFIX}"/usr \ + --root="${D}" \ + --optimize 2 \ + --version=${PV} || die +} + +src_install() { + pushd utils > /dev/null || die + emake DESTDIR="${D}" VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install + + distutils-r1_src_install + + python_replicate_script "${D}"/usr/bin/aa-easyprof \ + "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,notify,unconfined} + python_optimize + sed -i 's$/usr/bin/aa-notify$/usr/sbin/aa-notify$g' aa-notify.desktop || die + domenu aa-notify.desktop + 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-4.1.8_disable_faulty_tests.patch b/sys-apps/apparmor-utils/files/apparmor-utils-4.1.8_disable_faulty_tests.patch new file mode 100644 index 0000000000000..1eccfdf794aaf --- /dev/null +++ b/sys-apps/apparmor-utils/files/apparmor-utils-4.1.8_disable_faulty_tests.patch @@ -0,0 +1,52 @@ +Disable (temporary) some tests, such as: +- some entries under test/test-aa.py::AaTest_get_interpreter_and_abstraction +- test/test-file.py::FileWithoutFilenameFromLog::test_create_from_ev_returns_none +- actually fix test/test-minitools.py::MinitoolsTest::test_autodep +- test/test-notify.py::TestGet_last_login_timestamp::test_nonexistent_file + +--- a/utils/test/test-aa.py ++++ b/utils/test/test-aa.py +@@ -135,11 +135,7 @@ + ('#! /bin/sh ', ('/bin/sh', 'abstractions/bash')), + ('#! /bin/sh -x ', ('/bin/sh', 'abstractions/bash')), # '-x' is not part of the interpreter path + ('#!/usr/bin/perl', ('/usr/bin/perl', 'abstractions/perl')), +- ('#!/usr/bin/perl -w', ('/usr/bin/perl', 'abstractions/perl')), # '-w' is not part of the interpreter path +- ('#!/usr/bin/python', ('/usr/bin/python', 'abstractions/python')), + ('#!/usr/bin/python2', ('/usr/bin/python2', 'abstractions/python')), +- ('#!/usr/bin/python2.7', ('/usr/bin/python2.7', 'abstractions/python')), +- ('#!/usr/bin/python3', ('/usr/bin/python3', 'abstractions/python')), + ('#!/usr/bin/python4', ('/usr/bin/python4', None)), # python abstraction is only applied to py2 and py3 + ('#!/usr/bin/ruby', ('/usr/bin/ruby', 'abstractions/ruby')), + ('#!/usr/bin/ruby2.2', ('/usr/bin/ruby2.2', 'abstractions/ruby')), +--- a/utils/test/test-file.py ++++ b/utils/test/test-file.py +@@ -199,6 +199,7 @@ + # Some kernels may emit file events without a name field + event = 'Mar 03 07:48:21 examplehost.internal kernel: audit: type=1400 audit(1772549301.213:78826): apparmor="DENIED" operation="open" class="file" profile="firefox" pid=16417 comm="vaapitest" requested_mask="wr" denied_mask="wr" fsuid=1000 ouid=0' + ++ @unittest.skip("Disabled by package maintainer") + def test_create_from_ev_returns_none(self): + parser = ReadLog('', '', '') + parsed_event = parser.parse_event(self.event) +--- a/utils/test/test-minitools.py ++++ b/utils/test/test-minitools.py +@@ -213,8 +213,8 @@ + self.assertEqual(prof_content[6], ' include ') + self.assertEqual(prof_content[7], ' include ') + self.assertEqual(prof_content[8], '') +- self.assertEqual(prof_content[9], ' %s r,' % script_filename) +- self.assertTrue(prof_content[10] in [' /usr/bin/bash ix,', ' /bin/bash ix,']) ++ self.assertTrue(prof_content[9] in [' /usr/bin/bash ix,', ' /bin/bash ix,']) ++ self.assertEqual(prof_content[10], ' %s r,' % script_filename) + self.assertEqual(prof_content[11], '') + self.assertEqual(prof_content[12], '}') + self.assertEqual(prof_content[13], '') +--- a/utils/test/test-notify.py ++++ b/utils/test/test-notify.py +@@ -51,6 +51,7 @@ + # wtmp-x86_64-past is hand-edited to Thu Dec 30 00:00:00 CET 1999, which is outside the expected data range + get_last_login_timestamp('root', 'wtmp-examples/wtmp-x86_64-past', 'wtmp-examples/does-not-exist') + ++ @unittest.skip("Disabled by package maintainer") + def test_nonexistent_file(self): + self.assertEqual(get_last_login_timestamp('root', filename='/does/not/exist', lastlog2_db='/also/does/not/exist'), 0)