SPECS: aufs.spec - added apparmor support (apparmor.patch)

zbyniu zbyniu at pld-linux.org
Wed Nov 5 11:12:10 CET 2008


Author: zbyniu                       Date: Wed Nov  5 10:12:10 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added apparmor support (apparmor.patch)

---- Files affected:
SPECS:
   aufs.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/aufs.spec
diff -u SPECS/aufs.spec:1.40 SPECS/aufs.spec:1.41
--- SPECS/aufs.spec:1.40	Tue Nov  4 22:29:45 2008
+++ SPECS/aufs.spec	Wed Nov  5 11:12:04 2008
@@ -35,6 +35,7 @@
 #Patch1:		%{pname}-disable-security_inode_permission.patch
 Patch2:		%{pname}-fixes.patch
 #Patch3:		%{pname}-spin_lock.patch
+Patch4:		%{pname}-apparmor.patch
 URL:		http://aufs.sourceforge.net/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.25.2}
@@ -88,12 +89,16 @@
 #%patch1 -p1
 %patch2 -p1
 #%patch3 -p1
+if [ -d %{_kernelsrcdir}/security/apparmor ]; then
+%patch4 -p1
+fi
 
 cp -a include/linux fs/aufs25
 
 %build
 %if %{with kernel}
-if [ -f %{_kernelsrcdir}/include/linux/vs_base.h ]; then
+if [ -f %{_kernelsrcdir}/include/linux/vs_base.h &&
+     ! -d %{_kernelsrcdir}/security/apparmor ]; then
 	isvserver="-DVSERVER"
 fi
 %ifarch %{x8664} ia64 ppc64 sparc64
@@ -164,6 +169,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2008/11/05 10:12:04  zbyniu
+- added apparmor support (apparmor.patch)
+
 Revision 1.40  2008/11/04 21:29:45  zbyniu
 - set CONFIG_AUFS_INO_T_64 for 64bit archs; cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/aufs.spec?r1=1.40&r2=1.41&f=u



More information about the pld-cvs-commit mailing list