Develop and Download Open Source Software

CaitSith

Browse Subversion Repository

/[caitsith]/branches/for-mainline/security/caitsith/security.diff

Diff of /branches/for-mainline/security/caitsith/security.diff

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 266 by kumaneko, Wed Nov 16 14:13:01 2016 UTC revision 267 by kumaneko, Mon Aug 27 10:15:55 2018 UTC
# Line 1  Line 1 
1  diff --git a/security/Kconfig b/security/Kconfig  diff --git a/security/Kconfig b/security/Kconfig
2  index 118f454..d637481 100644  index 27d8b26..5e7b67d 100644
3  --- a/security/Kconfig  --- a/security/Kconfig
4  +++ b/security/Kconfig  +++ b/security/Kconfig
5  @@ -164,6 +164,7 @@ source security/tomoyo/Kconfig  @@ -236,6 +236,7 @@ source security/tomoyo/Kconfig
6   source security/apparmor/Kconfig   source security/apparmor/Kconfig
7   source security/loadpin/Kconfig   source security/loadpin/Kconfig
8   source security/yama/Kconfig   source security/yama/Kconfig
# Line 10  index 118f454..d637481 100644 Line 10  index 118f454..d637481 100644
10    
11   source security/integrity/Kconfig   source security/integrity/Kconfig
12    
13  @@ -173,6 +174,7 @@ choice  @@ -245,6 +246,7 @@ choice
14          default DEFAULT_SECURITY_SMACK if SECURITY_SMACK          default DEFAULT_SECURITY_SMACK if SECURITY_SMACK
15          default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO          default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO
16          default DEFAULT_SECURITY_APPARMOR if SECURITY_APPARMOR          default DEFAULT_SECURITY_APPARMOR if SECURITY_APPARMOR
# Line 18  index 118f454..d637481 100644 Line 18  index 118f454..d637481 100644
18          default DEFAULT_SECURITY_DAC          default DEFAULT_SECURITY_DAC
19    
20          help          help
21  @@ -191,6 +193,9 @@ choice  @@ -263,6 +265,9 @@ choice
22          config DEFAULT_SECURITY_APPARMOR          config DEFAULT_SECURITY_APPARMOR
23                  bool "AppArmor" if SECURITY_APPARMOR=y                  bool "AppArmor" if SECURITY_APPARMOR=y
24    
# Line 28  index 118f454..d637481 100644 Line 28  index 118f454..d637481 100644
28          config DEFAULT_SECURITY_DAC          config DEFAULT_SECURITY_DAC
29                  bool "Unix Discretionary Access Controls"                  bool "Unix Discretionary Access Controls"
30    
31  @@ -202,6 +207,7 @@ config DEFAULT_SECURITY  @@ -274,6 +279,7 @@ config DEFAULT_SECURITY
32          default "smack" if DEFAULT_SECURITY_SMACK          default "smack" if DEFAULT_SECURITY_SMACK
33          default "tomoyo" if DEFAULT_SECURITY_TOMOYO          default "tomoyo" if DEFAULT_SECURITY_TOMOYO
34          default "apparmor" if DEFAULT_SECURITY_APPARMOR          default "apparmor" if DEFAULT_SECURITY_APPARMOR
# Line 37  index 118f454..d637481 100644 Line 37  index 118f454..d637481 100644
37    
38   endmenu   endmenu
39  diff --git a/security/Makefile b/security/Makefile  diff --git a/security/Makefile b/security/Makefile
40  index f2d71cd..3745af0 100644  index 4d2d378..a3ac88b 100644
41  --- a/security/Makefile  --- a/security/Makefile
42  +++ b/security/Makefile  +++ b/security/Makefile
43  @@ -9,6 +9,7 @@ subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo  @@ -10,6 +10,7 @@ subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo
44   subdir-$(CONFIG_SECURITY_APPARMOR)     += apparmor   subdir-$(CONFIG_SECURITY_APPARMOR)     += apparmor
45   subdir-$(CONFIG_SECURITY_YAMA)         += yama   subdir-$(CONFIG_SECURITY_YAMA)         += yama
46   subdir-$(CONFIG_SECURITY_LOADPIN)      += loadpin   subdir-$(CONFIG_SECURITY_LOADPIN)      += loadpin
# Line 48  index f2d71cd..3745af0 100644 Line 48  index f2d71cd..3745af0 100644
48    
49   # always enable default capabilities   # always enable default capabilities
50   obj-y                                  += commoncap.o   obj-y                                  += commoncap.o
51  @@ -25,6 +26,7 @@ obj-$(CONFIG_SECURITY_APPARMOR)               += apparmor/  @@ -26,6 +27,7 @@ obj-$(CONFIG_SECURITY_APPARMOR)               += apparmor/
52   obj-$(CONFIG_SECURITY_YAMA)            += yama/   obj-$(CONFIG_SECURITY_YAMA)            += yama/
53   obj-$(CONFIG_SECURITY_LOADPIN)         += loadpin/   obj-$(CONFIG_SECURITY_LOADPIN)         += loadpin/
54   obj-$(CONFIG_CGROUP_DEVICE)            += device_cgroup.o   obj-$(CONFIG_CGROUP_DEVICE)            += device_cgroup.o
Legend:
Removed from v.266  
changed lines
  Added in v.267
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help