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 A27161582EF for ; Mon, 10 Feb 2025 02:39:13 +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 87F68342F9E for ; Mon, 10 Feb 2025 02:39:13 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C1245110471; Mon, 10 Feb 2025 02:39:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B1644110471 for ; Mon, 10 Feb 2025 02:39:09 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5DED4342F9E for ; Mon, 10 Feb 2025 02:39:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD6362725 for ; Mon, 10 Feb 2025 02:39:07 +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: <1739155117.06b744e3a820e7b3e8391e2fd06f50493bb01ec0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/apparmor/apparmor-3.1.4-r2.ebuild sys-apps/apparmor/apparmor-3.1.4.ebuild sys-apps/apparmor/files/apparmor-3.1.4-fix-hardcoded-path.patch X-VCS-Directories: sys-apps/apparmor/ sys-apps/apparmor/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 06b744e3a820e7b3e8391e2fd06f50493bb01ec0 X-VCS-Branch: master Date: Mon, 10 Feb 2025 02:39:07 +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: b11f15ce-f8b7-4bfa-9722-092545ebae84 X-Archives-Hash: 0b0e94b271fed96d0e5cd8c25cd5c9db commit: 06b744e3a820e7b3e8391e2fd06f50493bb01ec0 Author: Ao Luo gmail com> AuthorDate: Tue Mar 12 05:40:07 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Feb 10 02:38:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b744e3 sys-apps/apparmor: Fix hardcoded paths for loading apparmor functions Closes: https://bugs.gentoo.org/895302 Signed-off-by: Ao Luo gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35698 Signed-off-by: Sam James gentoo.org> ...armor-3.1.4.ebuild => apparmor-3.1.4-r2.ebuild} | 1 + .../files/apparmor-3.1.4-fix-hardcoded-path.patch | 34 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild b/sys-apps/apparmor/apparmor-3.1.4-r2.ebuild similarity index 97% rename from sys-apps/apparmor/apparmor-3.1.4.ebuild rename to sys-apps/apparmor/apparmor-3.1.4-r2.ebuild index 141029aefee8..2e87cb1c0fdf 100644 --- a/sys-apps/apparmor/apparmor-3.1.4.ebuild +++ b/sys-apps/apparmor/apparmor-3.1.4-r2.ebuild @@ -36,6 +36,7 @@ S=${WORKDIR}/apparmor-${PV}/parser PATCHES=( "${FILESDIR}/${PN}-3.0.5-makefile.patch" "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch" + "${FILESDIR}/${PN}-3.1.4-fix-hardcoded-path.patch" ) src_prepare() { diff --git a/sys-apps/apparmor/files/apparmor-3.1.4-fix-hardcoded-path.patch b/sys-apps/apparmor/files/apparmor-3.1.4-fix-hardcoded-path.patch new file mode 100644 index 000000000000..6e7c83d766e4 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-3.1.4-fix-hardcoded-path.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/895302 +--- a/apparmor.systemd ++++ b/apparmor.systemd +@@ -15,7 +15,7 @@ + # along with this program; if not, contact Novell, Inc. + # ---------------------------------------------------------------------- + +-APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions ++APPARMOR_FUNCTIONS=/usr/libexec/rc.apparmor.functions + + aa_action() + { +--- a/profile-load ++++ b/profile-load +@@ -21,7 +21,7 @@ + + [ -z "$1" ] && exit 1 # require a profile name + +-. /lib/apparmor/rc.apparmor.functions ++. /usr/libexec/rc.apparmor.functions + + # do not load in a container + if [ -x /usr/bin/systemd-detect-virt ] && \ +--- a/rc.apparmor.slackware ++++ b/rc.apparmor.slackware +@@ -18,7 +18,7 @@ + # rc.apparmor by Steve Beattie + # + # /etc/rc.d/rc.apparmor +-APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions ++APPARMOR_FUNCTIONS=/usr/libexec/rc.apparmor.functions + + aa_action() { + STRING=$1