[pve-devel] r5246 - pve-kernel-2.6.35/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-08 12:16:07 +0000 (Fri, 08 Oct 2010)
New Revision: 5246

Modified:
   pve-kernel-2.6.35/trunk/Makefile
   pve-kernel-2.6.35/trunk/README
   pve-kernel-2.6.35/trunk/changelog.Debian
   pve-kernel-2.6.35/trunk/config-2.6.35.diff
Log:


Modified: pve-kernel-2.6.35/trunk/Makefile
===================================================================
--- pve-kernel-2.6.35/trunk/Makefile	2010-10-08 11:13:35 UTC (rev 5245)
+++ pve-kernel-2.6.35/trunk/Makefile	2010-10-08 12:16:07 UTC (rev 5246)
@@ -1,7 +1,7 @@
 RELEASE=1.6
 
 KERNEL_VER=2.6.35
-PKGREL=4
+PKGREL=5
 
 KREL=1
 

Modified: pve-kernel-2.6.35/trunk/README
===================================================================
--- pve-kernel-2.6.35/trunk/README	2010-10-08 11:13:35 UTC (rev 5245)
+++ pve-kernel-2.6.35/trunk/README	2010-10-08 12:16:07 UTC (rev 5246)
@@ -70,6 +70,7 @@
 
 - enable CONFIG_BLK_CGROUP=y and CONFIG_CFQ_GROUP_IOSCHED=y
 
+- use selinux insead of apparmor (CONFIG_DEFAULT_SECURITY_SELINUX=y)
   
 Testing final kernel with kvm
 -----------------------------

Modified: pve-kernel-2.6.35/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.35/trunk/changelog.Debian	2010-10-08 11:13:35 UTC (rev 5245)
+++ pve-kernel-2.6.35/trunk/changelog.Debian	2010-10-08 12:16:07 UTC (rev 5246)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.35 (2.6.35-5) unstable; urgency=low
+
+  * use selinux insead of apparmor (CONFIG_DEFAULT_SECURITY_SELINUX=y)
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 08 Oct 2010 14:14:59 +0200
+
 pve-kernel-2.6.35 (2.6.35-4) unstable; urgency=low
 
   * bug fix: really enable CONFIG_BLK_CGROUP

Modified: pve-kernel-2.6.35/trunk/config-2.6.35.diff
===================================================================
--- pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-10-08 11:13:35 UTC (rev 5245)
+++ pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-10-08 12:16:07 UTC (rev 5246)
@@ -1,5 +1,5 @@
---- config-2.6.35.org	2010-10-08 12:56:31.000000000 +0200
-+++ config-2.6.35	2010-10-08 13:10:23.000000000 +0200
+--- config-2.6.35.org	2010-10-08 13:14:01.000000000 +0200
++++ config-2.6.35	2010-10-08 14:09:39.000000000 +0200
 @@ -411,7 +411,8 @@
  CONFIG_BINFMT_ELF=y
  CONFIG_BINFMT_MISC=m
@@ -19,6 +19,20 @@
  CONFIG_DEBUG_KERNEL=y
  # CONFIG_DEBUG_KMEMLEAK is not set
  # CONFIG_DEBUG_KOBJECT is not set
+@@ -973,10 +974,10 @@
+ CONFIG_DEFAULT_IO_DELAY_TYPE=1
+ # CONFIG_DEFAULT_NOOP is not set
+ # CONFIG_DEFAULT_RENO is not set
+-CONFIG_DEFAULT_SECURITY="apparmor"
+-CONFIG_DEFAULT_SECURITY_APPARMOR=y
++CONFIG_DEFAULT_SECURITY="selinux"
++# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+ # CONFIG_DEFAULT_SECURITY_DAC is not set
+-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
++CONFIG_DEFAULT_SECURITY_SELINUX=y
+ # CONFIG_DEFAULT_SECURITY_SMACK is not set
+ # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+ # CONFIG_DEFAULT_SECURITY_YAMA is not set
 @@ -1007,12 +1008,15 @@
  CONFIG_DLCI=m
  CONFIG_DLCI_MAX=8
@@ -81,7 +95,18 @@
  CONFIG_SCSI_HPTIOP=m
  CONFIG_SCSI_IBMMCA=m
  CONFIG_SCSI_IMM=m
-@@ -5347,12 +5352,12 @@
+@@ -3702,9 +3707,7 @@
+ CONFIG_SECCOMP=y
+ CONFIG_SECURITY=y
+ CONFIG_SECURITYFS=y
+-CONFIG_SECURITY_APPARMOR=y
+-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+-CONFIG_SECURITY_APPARMOR_COMPAT_24=y
++# CONFIG_SECURITY_APPARMOR is not set
+ CONFIG_SECURITY_NETWORK=y
+ # CONFIG_SECURITY_NETWORK_XFRM is not set
+ CONFIG_SECURITY_PATH=y
+@@ -5347,12 +5350,12 @@
  #
  # Config options for config.flavour.server automatically generated by splitconfig.pl
  #
@@ -99,7 +124,7 @@
  CONFIG_SCSI_SPI_ATTRS=y
  CONFIG_SCSI_SYM53C8XX_2=y
  CONFIG_VIRTIO=y
-@@ -5362,3 +5367,7 @@
+@@ -5362,3 +5365,7 @@
  CONFIG_VIRTIO_RING=y
  CONFIG_XEN_BLKDEV_FRONTEND=m
  CONFIG_XEN_NETDEV_FRONTEND=m