diff options
author | William Pitcock <nenolod@dereferenced.org> | 2011-12-02 22:59:11 -0600 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-03 09:54:35 +0000 |
commit | 0119928f05163c50fdedc88e8ff58947719f84c5 (patch) | |
tree | 7b670d5d767b919e2f79d588c1968f7776b564d5 | |
parent | ad83cb86a29b349b5b83c68a865c550224a09b5f (diff) | |
download | aports-0119928f05163c50fdedc88e8ff58947719f84c5.tar.bz2 aports-0119928f05163c50fdedc88e8ff58947719f84c5.tar.xz |
main/linux-grsec: add netlink taskstats accounting support
(cherry picked from commit 6ae1b47de9d5866ee5f2c57413045585171d8e20)
-rw-r--r-- | main/dahdi-linux-grsec/APKBUILD | 2 | ||||
-rw-r--r-- | main/linux-grsec/APKBUILD | 6 | ||||
-rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 5 | ||||
-rw-r--r-- | main/linux-grsec/kernelconfig.x86_64 | 7 | ||||
-rw-r--r-- | main/open-iscsi-grsec/APKBUILD | 2 | ||||
-rw-r--r-- | main/open-vm-tools-grsec/APKBUILD | 2 | ||||
-rw-r--r-- | main/xtables-addons-grsec/APKBUILD | 2 |
7 files changed, 16 insertions, 10 deletions
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 79d5f78306..fe6ac49da7 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -3,7 +3,7 @@ _flavor=grsec _kver=3.0.12 -_kpkgrel=0 +_kpkgrel=1 _mypkgrel=0 # verify the kernel version before entering chroot diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index c29fac6b62..715cf00bed 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=3.0.12 _kernver=3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -144,5 +144,5 @@ a129184102c16a4ee39afe50cae43efd grsecurity-2.2.2-3.0.12-unofficial.patch c41cf0ee9794f393423c6b2093072260 grsec-timblogiw-noconst.patch ebb99ef6ad8cd2d9fd8f49d5c5849057 0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch -57c444f3e8bb60a7f5782330bc450efa kernelconfig.x86 -f00f1c26ef7ddcdc4467bb883a71522b kernelconfig.x86_64" +587b1fb2f6a5c9ba714900b856f57f09 kernelconfig.x86 +0b7758a8c0fc63cdaa53330ace7d8402 kernelconfig.x86_64" diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 9ce50ffb95..526d956762 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -80,7 +80,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 diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index bb9066f94f..ef55302273 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.9 Kernel Configuration +# Linux/x86_64 3.0.12 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 diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD index ea049fa31b..0fe0751694 100644 --- a/main/open-iscsi-grsec/APKBUILD +++ b/main/open-iscsi-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec _realname=open-iscsi _realver=2.0-872 _kver=3.0.12 -_kpkgrel=0 +_kpkgrel=1 # verify the kernel version before entering chroot if [ -f ../linux-${_flavor}/APKBUILD ]; then diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index d5d85c939e..f946dba427 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -7,7 +7,7 @@ _realver=2011.09.23 _realsubver=491607 _kver=3.0.12 -_kpkgrel=0 +_kpkgrel=1 # source open-vm-tools version if [ -f ../main/$_realname/APKBUILD ]; then diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index eec3eeff5f..2f5dbc558f 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -4,7 +4,7 @@ _realname=xtables-addons _name=$_realname-$_flavor _kver=3.0.12 -_kpkgrel=0 +_kpkgrel=1 # source the kernel version if [ -f ../linux-$_flavor/APKBUILD ]; then |