aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-05-25 06:44:52 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-05-25 06:44:52 +0000
commitfdb545943ae4b7cad3d40874b28d3993913c5126 (patch)
tree37d66fa4dee309b35b6079bdf557a34ccdefa363
parente407b99757d2de626285db2da8692c7c883d6436 (diff)
downloadaports-fdb545943ae4b7cad3d40874b28d3993913c5126.tar.bz2
aports-fdb545943ae4b7cad3d40874b28d3993913c5126.tar.xz
main/linux-grsec: enable CPUSETS for virtgrsec x86_64 config
fixes #4246
-rw-r--r--main/linux-grsec/APKBUILD8
-rw-r--r--main/linux-grsec/config-virtgrsec.x86_645
2 files changed, 7 insertions, 6 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 2aaa673081..8d02076fb3 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=${pkgver};;
esac
-pkgrel=0
+pkgrel=1
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -208,7 +208,7 @@ b0337a2a9abed17c37eae5db332522d2 fix-spi-nor-namespace-clash.patch
9476dc4a1d21009764680816fde71152 config-grsec.x86_64
6af88f5e681a237e3c58e8154a40fb47 config-grsec.armhf
18cb4521f9a8847637292f9f4c9e8256 config-virtgrsec.x86
-2408367e7833084385bff42995dfcd3a config-virtgrsec.x86_64"
+80b45900be93b1183a6382adf710d961 config-virtgrsec.x86_64"
sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd linux-3.18.tar.xz
488ac8f9fb1bcc5670d2222a4f382ca4e4950c4489bc5217c244b787d2ac8974 patch-3.18.14.xz
095a1af25364c288598d96114bba48aa39f8c74acfd17ba00268c65b65cf1b1d grsecurity-3.1-3.18.14-201505191737-alpine.patch
@@ -219,7 +219,7 @@ sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd li
18cc34f2d603baf82af7093daaf024d74047506154e53de27fb49ba65a2551d1 config-grsec.x86_64
c796c15a32c848cfd6b67c2f22273fb3e26872f9325a6564f316b17b947eeaaf config-grsec.armhf
47048993111506ab74db24c92d39b536cf5e684975844907d5cb6198c1dfd87f config-virtgrsec.x86
-0ebd5cf41a8c22fb8fe0c19d38833dc3e2b0b5e58b098e31315fcb766a18570e config-virtgrsec.x86_64"
+015ce51a03f1337673b47ef996b77c55cf50a28240e37c5ebf7e66f5886d3aef config-virtgrsec.x86_64"
sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 linux-3.18.tar.xz
ba898f08a0252f3bc99b4bb3916dfd6af1935bf6d149a9204b834a16ec615a5f0f53e73c14075c40efd8a8f5cf64b9f1b7dc3e74fb5f5fab87d7b0c6b0517315 patch-3.18.14.xz
af53b1436d5ade6caa7e6b90c1e521f33ca519876063da5d8f9062dd03448a1eb2a2c352d266d4c624a13c8ebb7b23a5c058cae2f3a1c9f09155afcd70704266 grsecurity-3.1-3.18.14-201505191737-alpine.patch
@@ -230,4 +230,4 @@ ee88d6b3984a97f18d721d49ae76b302a80d4c0f8779d580199d35869358423e22895b1245725d34
20ba11b7b2d874a354aa4c364cac6885863deddd4c166ad98e0d5dcb24d102b0e3875eef60a252e1bedb1526fd25e11721c78e6ca50baf5fc4a9ec58e1c3b1a2 config-grsec.x86_64
a54a297c3e0700242b1745d5377fa16585bec0b2d9e94b0bf3a4afee04a193413441e850e1233664d2692833245f7994ce5166fe99513d9a8247c9cdf9f87200 config-grsec.armhf
c6bebe64953a444bc7d13f932e44d081665c253121189a3ccca9d7f6145b4460e32dc0f21f4700bf6607c5c0cb79de5c8576e4da0c815d60cff0d3b90879c1d9 config-virtgrsec.x86
-0d1a243b87ec7ba7fa7d1ba1608c6bbce1cecf0b19c912f596c5574f5bc027eb71b07ed28afefc7c209bb718e137b6e11ffb3172deb41cc61f022e32acd8022e config-virtgrsec.x86_64"
+47f93ae57dc923efe81132b00a8c0a5f4aa029a5f64e411110b1ef99dc018f9d7d8af1632ea7ea42693e847388484b149f666db7dd7f423b5b1ad3baed83d75f config-virtgrsec.x86_64"
diff --git a/main/linux-grsec/config-virtgrsec.x86_64 b/main/linux-grsec/config-virtgrsec.x86_64
index 4bd03e27d1..be0282acc6 100644
--- a/main/linux-grsec/config-virtgrsec.x86_64
+++ b/main/linux-grsec/config-virtgrsec.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.18.6 Kernel Configuration
+# Linux/x86 3.18.14 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -147,7 +147,8 @@ CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
-# CONFIG_CPUSETS is not set
+CONFIG_CPUSETS=y
+# CONFIG_PROC_PID_CPUSET is not set
CONFIG_CGROUP_CPUACCT=y
# CONFIG_RESOURCE_COUNTERS is not set
# CONFIG_CGROUP_PERF is not set