aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-11-21 12:20:47 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-11-22 12:49:15 +0000
commitba0d340317d760230150038f8c6252a166dd11ff (patch)
tree9f4f6484bbf0e7377147fbaf97022915be87f9de
parent689804d336b3dea227e933f115deb982ddf07e36 (diff)
downloadaports-ba0d340317d760230150038f8c6252a166dd11ff.tar.bz2
aports-ba0d340317d760230150038f8c6252a166dd11ff.tar.xz
main/*-grsec: enable CRYPTO_DEV_GEODE
(cherry picked from commit 78ca6319638430577850e60eefa2ef6142777f58)
-rw-r--r--main/dahdi-linux-grsec/APKBUILD2
-rw-r--r--main/linux-grsec/APKBUILD4
-rw-r--r--main/linux-grsec/kernelconfig.x862
-rw-r--r--main/open-iscsi-grsec/APKBUILD2
-rw-r--r--main/open-vm-tools-grsec/APKBUILD2
-rw-r--r--main/xtables-addons-grsec/APKBUILD2
6 files changed, 7 insertions, 7 deletions
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index 02ffc2cf9e..f3ed843ce9 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -3,7 +3,7 @@
_flavor=grsec
_kver=3.0.9
-_kpkgrel=1
+_kpkgrel=2
_mypkgrel=0
# verify the kernel version before entering chroot
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index cf93706259..36ce8257ef 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
pkgname=linux-${_flavor}
pkgver=3.0.9
_kernver=3.0
-pkgrel=1
+pkgrel=2
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -144,5 +144,5 @@ md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
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
-36330138ac7e1e776b3917a81ba51546 kernelconfig.x86
+57c444f3e8bb60a7f5782330bc450efa kernelconfig.x86
f00f1c26ef7ddcdc4467bb883a71522b kernelconfig.x86_64"
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index e1a841c260..9ce50ffb95 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -5247,7 +5247,7 @@ CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-# CONFIG_CRYPTO_DEV_GEODE is not set
+CONFIG_CRYPTO_DEV_GEODE=m
CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
CONFIG_HAVE_KVM=y
diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD
index a4511fa895..fa87e68342 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.9
-_kpkgrel=1
+_kpkgrel=2
# 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 8bbfde0b50..cb8cf8ae45 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.9
-_kpkgrel=1
+_kpkgrel=2
# 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 f09eacc6a1..d4e37faa58 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.9
-_kpkgrel=1
+_kpkgrel=2
# source the kernel version
if [ -f ../linux-$_flavor/APKBUILD ]; then