From 4f6e7d6ae6fd54e5ef243d8553ce11f90f509c7d Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 18 Aug 2023 08:30:03 -0700 Subject: [PATCH] Fix Apparmor (#695) * fix(apparmor): update version name Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * fix: move alpha to version Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * fix: don't include version in name Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * fix: include files Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * fix: include file Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/apparmor/apparmor.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anda/lib/apparmor/apparmor.spec b/anda/lib/apparmor/apparmor.spec index 759b5163e9..9714a69c10 100644 --- a/anda/lib/apparmor/apparmor.spec +++ b/anda/lib/apparmor/apparmor.spec @@ -11,7 +11,7 @@ Summary: AppArmor userspace components License: GPL-2.0 URL: https://launchpad.net/apparmor -Source0: %{url}/%{baseversion}/%{version}/+download/%{name}-%{version}.tar.gz +Source0: %{url}/%{baseversion}/%{version}-alpha2/+download/%{name}-%{version}~alpha2.tar.gz Source1: apparmor.preset Patch01: 0001-fix-avahi-daemon-authselect-denial-in-fedora.patch Patch02: 0001-All-current-versions-of-RHEL-and-Fedora-that-are-not.patch @@ -138,7 +138,7 @@ confinement policies when running virtual hosts in the webserver by using the changehat abilities exposed through libapparmor. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{version}~alpha2 %build export PYTHON=%{__python3} @@ -231,6 +231,7 @@ make -C utils check %dir %{_sysconfdir}/apparmor.d/ %dir %{_sysconfdir}/apparmor.d/abi %config(noreplace) %{_sysconfdir}/apparmor.d/abi/3.0 +%config(noreplace) %{_sysconfdir}/apparmor.d/abi/4.0 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-outoftree-network %config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-vanilla %config(noreplace) %{_sysconfdir}/apparmor.d/php-fpm @@ -267,6 +268,7 @@ make -C utils check %{_bindir}/aa-enabled %{_bindir}/aa-exec %{_bindir}/aa-features-abi +%{_sbindir}/aa-load %{_sbindir}/aa-teardown %{_sbindir}/rcapparmor %{_unitdir}/apparmor.service