← Back to branch summary

~ubuntu-branches/ubuntu/vivid/aufs/vivid

« back to all changes in this revision

Viewing changes to debian/patches/04_sec_perm.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Julian Andres Klode
  • Date: 2008-05-06 18:35:50 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080506183550-0b6c974kkgc46oeh
Tags: 0+20080506-1
http://bugs.debian.org/479717
http://bugs.debian.org/475042
* New upstream release, supports Kernel 2.6.25 (Closes: #479717)
* Fix building with older Kernels (Closes: #475042)
* Update the patches 01, 04 and 07 to also patch fs/aufs25

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_sec_perm.dpatch
4
4
## DP: Disable security_inode_* calls to work with Kernel 2.6.24
5
5
 
6
6
@DPATCH@
7
 
diff -urNad aufs-0+20071211~/fs/aufs/i_op.c aufs-0+20071211/fs/aufs/i_op.c
8
 
--- aufs-0+20071211~/fs/aufs/i_op.c     2008-01-27 18:07:36.000000000 +0100
9
 
+++ aufs-0+20071211/fs/aufs/i_op.c      2008-01-27 18:08:28.000000000 +0100
10
 
@@ -69,7 +69,7 @@
 
7
Index: aufs-0+20080415/fs/aufs/i_op.c
 
8
===================================================================
 
9
--- aufs-0+20080415.orig/fs/aufs/i_op.c 2008-04-15 15:47:42.000000000 +0200
 
10
+++ aufs-0+20080415/fs/aufs/i_op.c      2008-04-15 15:53:22.000000000 +0200
 
11
@@ -57,7 +57,7 @@
11
12
                AuTraceErr(err);
12
13
        }
13
14
 
14
15
-#if 1
15
16
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) || defined(CONFIG_AUFS_SEC_PERM_PATCH)
16
 
        if (!err) {
17
 
 #ifndef CONFIG_AUFS_DLGT
18
 
                err = security_inode_permission(h_inode, mask, fake_nd);
 
17
        if (!err)
 
18
                err = au_security_inode_permission(h_inode, mask, fake_nd,
 
19
                                                   dlgt);
 
20
Index: aufs-0+20080415/fs/aufs/inode.h
 
21
===================================================================
 
22
--- aufs-0+20080415.orig/fs/aufs/inode.h        2008-04-15 15:48:27.000000000 +0200
 
23
+++ aufs-0+20080415/fs/aufs/inode.h     2008-04-15 15:54:08.000000000 +0200
 
24
@@ -108,7 +108,7 @@
 
25
 /* dlgt.c */
 
26
 int au_security_inode_permission(struct inode *h_inode, int mask,
 
27
                                 struct nameidata *fake_nd, int dlgt);
 
28
-#else
 
29
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) || defined(CONFIG_AUFS_SEC_PERM_PATCH)
 
30
 static inline
 
31
 int au_security_inode_permission(struct inode *h_inode, int mask,
 
32
                                 struct nameidata *fake_nd, int dlgt)
 
33
@DPATCH@
 
34
Index: aufs-0+20080415/fs/aufs/i_op.c
 
35
===================================================================
 
36
--- aufs-0+20080415.orig/fs/aufs25/i_op.c       2008-04-15 15:47:42.000000000 +0200
 
37
+++ aufs-0+20080415/fs/aufs25/i_op.c    2008-04-15 15:53:22.000000000 +0200
 
38
@@ -57,7 +57,7 @@
 
39
                AuTraceErr(err);
 
40
        }
 
41
 
 
42
-#if 1
 
43
+#if defined(CONFIG_AUFS_SEC_PERM_PATCH)
 
44
        if (!err)
 
45
                err = au_security_inode_permission(h_inode, mask, fake_nd,
 
46
                                                   dlgt);
 
47
Index: aufs-0+20080415/fs/aufs/inode.h
 
48
===================================================================
 
49
--- aufs-0+20080415.orig/fs/aufs25/inode.h      2008-04-15 15:48:27.000000000 +0200
 
50
+++ aufs-0+20080415/fs/aufs25/inode.h   2008-04-15 15:54:08.000000000 +0200
 
51
@@ -108,7 +108,7 @@
 
52
 /* dlgt.c */
 
53
 int au_security_inode_permission(struct inode *h_inode, int mask,
 
54
                                 struct nameidata *fake_nd, int dlgt);
 
55
-#else
 
56
+#elif defined(CONFIG_AUFS_SEC_PERM_PATCH)
 
57
 static inline
 
58
 int au_security_inode_permission(struct inode *h_inode, int mask,
 
59
                                 struct nameidata *fake_nd, int dlgt)