main/linux-vserver: harden vcontext access, add support for memory controller cgroup (needed by newest util-vserver), add netlink task stats accounting

5 files changed, 27 insertions, 16 deletions

diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD
index a4691a081c..c26cd6cf6b 100644
--- a/main/dahdi-linux-vserver/APKBUILD
+++ b/main/dahdi-linux-vserver/APKBUILD
@@ -5,7 +5,7 @@ _flavor=${FLAVOR:-vserver}
 _realname=dahdi-linux
 _name=$_realname-$_flavor
 _kver=3.0.10
-_kpkgrel=0
+_kpkgrel=1
 _myvsver=vs2.3.2.1
 
 # verify the kernel version before entering chroot
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index c2b0e0bbf4..e8ca6fb1da 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -3,7 +3,7 @@
 _flavor=vserver
 pkgname=linux-${_flavor}
 pkgver=3.0.10
-pkgrel=0
+pkgrel=1
 _vsver=vs2.3.2.1
 
 if [ "${pkgver##*.*.*}" = "$pkgver" ]; then
@@ -134,5 +134,5 @@ dev() {
 md5sums="398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
 8e0391dd935d838ee3023ab9daa6b447  patch-3.0.10.bz2
 6d2fd60b055272429dde5e4043280fcb  patch-3.0.10-vs2.3.2.1-unofficial.diff
-fdf2737ad7b77bcfe4290ef2b0112138  kernelconfig.x86
-f82d261dc117ced42e2a3dcd4b6850a5  kernelconfig.x86_64"
+4baec73eeb0ddc1148d580a6d1e29b1f  kernelconfig.x86
+148b84ad28167290f2f7f0420945cb92  kernelconfig.x86_64"
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86
index eb1d4bc289..849e86c412 100644
--- a/main/linux-vserver/kernelconfig.x86
+++ b/main/linux-vserver/kernelconfig.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 3.0.9-vs2.3.2.1 Kernel Configuration
+# Linux/i386 3.0.10-vs2.3.2.1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -81,7 +81,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
@@ -116,7 +119,9 @@ CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 # CONFIG_CPUSETS is not set
 CONFIG_CGROUP_CPUACCT=y
-# CONFIG_RESOURCE_COUNTERS is not set
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -129,6 +134,7 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -4915,7 +4921,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
@@ -4988,7 +4994,7 @@ CONFIG_VSERVER_PROC_SECURE=y
 CONFIG_TAGGING_ID24=y
 # CONFIG_TAGGING_INTERN is not set
 # CONFIG_TAG_NFSD is not set
-# CONFIG_VSERVER_PRIVACY is not set
+CONFIG_VSERVER_PRIVACY=y
 CONFIG_VSERVER_CONTEXTS=256
 CONFIG_VSERVER_WARN=y
 CONFIG_VSERVER_WARN_DEVPTS=y
diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64
index 3c6941e4c2..eb4f6368a1 100644
--- a/main/linux-vserver/kernelconfig.x86_64
+++ b/main/linux-vserver/kernelconfig.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 3.0.4-vs2.3.1-pre10.1 Kernel Configuration
+# Linux/x86_64 3.0.10-vs2.3.2.1 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -81,7 +81,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
@@ -118,7 +121,8 @@ CONFIG_CPUSETS=y
 # CONFIG_PROC_PID_CPUSET is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -131,6 +135,7 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -226,7 +231,7 @@ CONFIG_BLOCK_COMPAT=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=m
 CONFIG_IOSCHED_CFQ=y
-# CONFIG_CFQ_GROUP_IOSCHED is not set
+CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -4883,7 +4888,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
@@ -4955,7 +4960,7 @@ CONFIG_VSERVER_PROC_SECURE=y
 CONFIG_TAGGING_ID24=y
 # CONFIG_TAGGING_INTERN is not set
 # CONFIG_TAG_NFSD is not set
-# CONFIG_VSERVER_PRIVACY is not set
+CONFIG_VSERVER_PRIVACY=y
 CONFIG_VSERVER_CONTEXTS=768
 CONFIG_VSERVER_WARN=y
 CONFIG_VSERVER_WARN_DEVPTS=y
diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD
index c5f3b56679..1644eaf9d1 100644
--- a/main/open-vm-tools-vserver/APKBUILD
+++ b/main/open-vm-tools-vserver/APKBUILD
@@ -4,7 +4,7 @@ _flavor=vserver
 _realname=open-vm-tools
 _name=$_realname-$_flavor
 _kver=3.0.10
-_kpkgrel=0
+_kpkgrel=1
 _myvsver=vs2.3.2.1
 _mypkgrel=0