Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[f40] fix: apparmor (#1472) #1481

Merged
merged 1 commit into from
Jul 10, 2024
Merged

[f40] fix: apparmor (#1472) #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions anda/lib/apparmor/apparmor.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
%bcond_with tests

Name: apparmor
Version: 4.0.0~alpha3
Version: 4.0.1
Release: 2%{?dist}
Summary: AppArmor userspace components

%define baseversion %(echo %{version} | cut -d. -f-2)
%global normver %(echo %version | sed 's/~/-/')

License: GPL-2.0
URL: https://launchpad.net/apparmor
Source0: %{url}/%{baseversion}/%normver/+download/%{name}-%{version}.tar.gz
URL: https://gitlab.com/apparmor/apparmor
Source0: %url/-/archive/v%version/apparmor-v%version.tar.gz
Source1: apparmor.preset
Patch01: 0001-fix-avahi-daemon-authselect-denial-in-fedora.patch

Expand All @@ -32,6 +32,7 @@ BuildRequires: gettext
BuildRequires: pam-devel
BuildRequires: httpd-devel
BuildRequires: systemd-rpm-macros
BuildRequires: autoconf-archive
BuildRequires: gawk
BuildRequires: which
%if %{with tests}
Expand Down Expand Up @@ -138,7 +139,7 @@ confinement policies when running virtual hosts in the webserver by using the
changehat abilities exposed through libapparmor.

%prep
%autosetup -p1 -n %{name}-%{version}
%autosetup -p1 -n %name-v%version
sed -i 's/@VERSION@/%normver/g' libraries/libapparmor/swig/python/setup.py.in
sed -i 's/${VERSION}/%normver/g' utils/Makefile

Expand Down Expand Up @@ -265,7 +266,6 @@ make -C utils check
%doc parser/README
%doc parser/*.[1-9].html
%doc common/apparmor.css
%doc parser/techdoc.pdf
%{_sbindir}/apparmor_parser
%{_bindir}/aa-enabled
%{_bindir}/aa-exec
Expand All @@ -276,8 +276,8 @@ make -C utils check
%{_presetdir}/70-apparmor.preset
%{_prefix}/lib/apparmor
%dir %{_sysconfdir}/apparmor
%config(noreplace) %{_sysconfdir}/apparmor.d/
%config(noreplace) %{_sysconfdir}/apparmor/parser.conf
%{_sharedstatedir}/apparmor
%{_mandir}/man1/aa-enabled.1.gz
%{_mandir}/man1/aa-exec.1.gz
%{_mandir}/man1/aa-features-abi.1.gz
Expand Down
5 changes: 1 addition & 4 deletions anda/lib/apparmor/update.rhai
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
let html = get("https://launchpad.net/apparmor");
let v = find("Latest version is ([\\d.\\w\\-]+)", html, 1);
v.replace('-', '~');
rpm.version(v);
rpm.version(gitlab_tag("4484878"));
Loading