From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 271C31584AD for ; Thu, 24 Apr 2025 15:33:06 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0D238343023 for ; Thu, 24 Apr 2025 15:33:06 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 3D96011028B; Thu, 24 Apr 2025 15:33:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 3307211028B for ; Thu, 24 Apr 2025 15:33:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2FCA342FDB for ; Thu, 24 Apr 2025 15:33:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FC6E2529 for ; Thu, 24 Apr 2025 15:33:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1745508738.250018c715529602240c364509a260f74b97e931.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/apparmor/Manifest sys-apps/apparmor/apparmor-4.0.3.ebuild X-VCS-Directories: sys-apps/apparmor/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 250018c715529602240c364509a260f74b97e931 X-VCS-Branch: master Date: Thu, 24 Apr 2025 15:33:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 49b11f81-e00f-49a9-9c51-7dac24f802de X-Archives-Hash: 05dd569b506de60365b76955f26d4cf1 commit: 250018c715529602240c364509a260f74b97e931 Author: Martin Mokry protonmail com> AuthorDate: Sat Mar 29 17:21:59 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 24 15:32:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=250018c7 sys-apps/apparmor: add 4.0.3 Bump to 4.* to include python3.13 compatibility fixes Closes: https://bugs.gentoo.org/951169 Signed-off-by: Martin Mokry protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/41373 Signed-off-by: Sam James gentoo.org> sys-apps/apparmor/Manifest | 1 + sys-apps/apparmor/apparmor-4.0.3.ebuild | 98 +++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest index f3225ffc6ff8..cd2bf2da42f9 100644 --- a/sys-apps/apparmor/Manifest +++ b/sys-apps/apparmor/Manifest @@ -1 +1,2 @@ DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4 +DIST apparmor-4.0.3.tar.gz 8211339 BLAKE2B 715391a1fc0fb57b820a8bcebdc76ae96e436a29546b9c47019f10f4d22942431ba5c878d92bb61b47ff17012e026195b8d7d78a329cc1cc182a31bc3b512e63 SHA512 8b1240ec56fe4f987edcda9380de685e36f4ac931772e980a8f3655dfbfd7e337a4b15227c7ceecb87d9a2bb592e466ec39912ef8f2fa59f8802464d72df8da2 diff --git a/sys-apps/apparmor/apparmor-4.0.3.ebuild b/sys-apps/apparmor/apparmor-4.0.3.ebuild new file mode 100644 index 000000000000..f4bfde357734 --- /dev/null +++ b/sys-apps/apparmor/apparmor-4.0.3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic systemd toolchain-funcs linux-info + +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" +S=${WORKDIR}/apparmor-${PV}/parser + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~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 + app-alternatives/yacc + sys-devel/gettext + app-alternatives/lex + doc? ( dev-tex/latex2html ) +" +CONFIG_CHECK="SECURITY_APPARMOR" + +src_prepare() { + default + + sed -e '/^AALIB =/ s/-Bstatic/-Bdynamic/' -i Makefile || die + + # Install rc.apparmor.functions to Gentoo-appropriate location + sed -e '/install-indep: indep/a\\tinstall -m 755 -d ${DESTDIR}/usr/libexec' -i Makefile || die + sed -e 's:rc.apparmor.functions $(APPARMOR_BIN_PREFIX):rc.apparmor.functions ${DESTDIR}/usr/libexec:' \ + -i Makefile || die + sed -e ':^APPARMOR_FUNCTIONS=: s:/lib/apparmor/:/usr/libexec/:' -i apparmor.systemd || die + sed -e 's:\. /lib/apparmor/rc.apparmor.functions:\. /usr/libexec/rc.apparmor.functions:' -i profile-load || die + + # 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_configure() { + # ODR violations (bug #863524) + filter-lto + + default +} + +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" +}