pool/apparmor
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 868407 from home:lnussel:usrmove

Browse Source 
- prepare usrmerge (boo#1029961)
  * use %_pamdir

OBS-URL: https://build.opensuse.org/request/show/868407
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=289
This commit is contained in:
Christian Boltz 2021-02-01 18:27:47 +00:00 committed by Git OBS Bridge
parent cbfc4c18e3
commit a564ac7aa3
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apparmor.changes
View File

@ -5,6 +5,12 @@ Fri Jan 22 11:23:59 UTC 2021 - Christian Boltz <suse-beta@cboltz.de>
include in apache extra profile optional to avoid problems with empty
profile directory (boo#1178527)
-------------------------------------------------------------------
Wed Jan 13 10:45:18 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
* use %_pamdir
-------------------------------------------------------------------
Wed Dec 2 19:29:34 UTC 2020 - Christian Boltz <suse-beta@cboltz.de>

19
apparmor.spec
View File

@ -17,6 +17,12 @@
#
%if 0%{?usrmerged}
%define sbindir %_sbindir
%else
%define sbindir /sbin
%endif
# warning - confusing syntax ahead ;-)
# bcond_with means "disable"
# bcond_without means "enable"
@ -69,7 +75,7 @@ Patch6: apache-extra-profile-include-if-exists.diff
PreReq: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define apparmor_bin_prefix /lib/apparmor
%define apparmor_bin_prefix %{?usrmerged:/usr}/lib/apparmor
BuildRequires: bison
BuildRequires: dejagnu
BuildRequires: flex
@ -427,7 +433,7 @@ test -f %{buildroot}/usr/share/apparmor/cache/*/.features
test -f %{buildroot}/usr/share/apparmor/cache/*/bin.ping
%endif
%makeinstall -C parser
%makeinstall SBINDIR="%{buildroot}%{sbindir}" APPARMOR_BIN_PREFIX="%{buildroot}%{apparmor_bin_prefix}" -C parser
# default cache dir (up to 2.12) is /etc/apparmor.d/cache - not the best location.
# Use /var/lib/apparmor/cache and make /etc/apparmor.d/cache a symlink to it
mkdir -p %{buildroot}%{_localstatedir}/lib/apparmor/cache
@ -442,7 +448,7 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/apparmor
%endif
%if %{with pam}
%makeinstall -C changehat/pam_apparmor SECDIR=%{buildroot}/%{_lib}/security
%makeinstall -C changehat/pam_apparmor SECDIR=%{buildroot}%{_pamdir}
%endif
%if %{with tomcat}
@ -493,7 +499,10 @@ rm -fv %{buildroot}%{_libdir}/libapparmor.la
%defattr(-,root,root)
%license parser/COPYING.GPL
%doc parser/README
%{sbindir}/apparmor_parser
%if !0%{?usrmerged}
/sbin/apparmor_parser
%endif
%{_bindir}/aa-enabled
%{_bindir}/aa-exec
%{_bindir}/aa-features-abi
@ -506,7 +515,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmor.la
%dir %{_sysconfdir}/apparmor.d
%{_sysconfdir}/apparmor.d/cache
%{_sysconfdir}/apparmor.d/cache.d
/sbin/rcapparmor
%{sbindir}/rcapparmor
%{_unitdir}/apparmor.service
%config(noreplace) %{_sysconfdir}/apparmor/parser.conf
%{_localstatedir}/lib/apparmor
@ -662,7 +671,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmor.la
%files -n pam_apparmor
%defattr(444,root,root,755)
%attr(555,root,root) /%{_lib}/security/pam_apparmor.so
%attr(555,root,root) %{_pamdir}/pam_apparmor.so
%endif
%if %{with tomcat}