SHA256
1
0
forked from pool/exim

Accepting request 357608 from home:cboltz:branches:server:mail

- Move AppArmor profile to /usr/share/apparmor/extra-profiles/, which is
  the directory for inactive profiles since AppArmor 2.9

Please forward this fix to Factory (and 42.1, if you ever have to do an
update for it).


BTW: If you need help with updating the profile (ideally with the goal
to enable it by default), just ask.

OBS-URL: https://build.opensuse.org/request/show/357608
OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=174
This commit is contained in:
Lars Müller 2016-02-03 21:09:03 +00:00 committed by Git OBS Bridge
parent fa5a3911df
commit a34acdddfe
2 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 3 19:07:16 UTC 2016 - opensuse@cboltz.de
- Move AppArmor profile to /usr/share/apparmor/extra-profiles/, which is
the directory for inactive profiles since AppArmor 2.9
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 11 10:44:26 UTC 2015 - lmuelle@suse.com Fri Dec 11 10:44:26 UTC 2015 - lmuelle@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package exim # spec file for package exim
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -333,7 +333,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d/
%endif %endif
install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir} install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir}
# apparmor profile # apparmor profile
install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/etc/apparmor/profiles/extras/usr.sbin.exim install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/usr/share/apparmor/extra-profiles/usr.sbin.exim
%pre %pre
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
@ -417,10 +417,9 @@ exit 0
%if %{?suse_version:%suse_version}%{?!suse_version:99999} < 1000 %if %{?suse_version:%suse_version}%{?!suse_version:99999} < 1000
%config(noreplace) /etc/permissions.d/exim %config(noreplace) /etc/permissions.d/exim
%endif %endif
%dir /etc/apparmor %dir /usr/share/apparmor
%dir /etc/apparmor/profiles %dir /usr/share/apparmor/extra-profiles
%dir /etc/apparmor/profiles/extras %config(noreplace) /usr/share/apparmor/extra-profiles/usr.sbin.exim
%config(noreplace) /etc/apparmor/profiles/extras/usr.sbin.exim
/usr/sbin/rcexim /usr/sbin/rcexim
/usr/bin/mailq /usr/bin/mailq
/usr/bin/runq /usr/bin/runq