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.

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

fix: apparmor #1920

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions anda/lib/apparmor/apparmor.spec
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
%{?python_enable_dependency_generator}

%bcond_with tests
%global normver 4.1.0-beta1

Name: apparmor
Version: 4.1.0.beta1
Version: %(echo %normver | sed 's/-/~/')
Release: 1%?dist
Summary: AppArmor userspace components

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

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

Expand Down Expand Up @@ -139,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-v%version
%autosetup -p1 -n apparmor-v%normver
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 @@ -171,6 +171,7 @@ popd
APPARMOR_BIN_PREFIX=%{buildroot}%{_prefix}/lib/apparmor \
SBINDIR=%{buildroot}%{_sbindir}
%make_install -C profiles
mkdir -p %buildroot%_datadir/polkit-1/actions/
%make_install -C utils
%make_install -C changehat/pam_apparmor \
SECDIR=%{buildroot}%{_libdir}/security
Expand Down
2 changes: 1 addition & 1 deletion anda/lib/apparmor/update.rhai
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rpm.version(gitlab_tag("4484878"));
rpm.global("normver", gitlab_tag("4484878"));
Loading