diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-11-21 12:20:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-11-22 12:49:15 +0000 |
| commit | ba0d340317d760230150038f8c6252a166dd11ff (patch) | |
| tree | 9f4f6484bbf0e7377147fbaf97022915be87f9de | |
| parent | 689804d336b3dea227e933f115deb982ddf07e36 (diff) | |
| download | alpine_aports-ba0d340317d760230150038f8c6252a166dd11ff.tar.bz2 alpine_aports-ba0d340317d760230150038f8c6252a166dd11ff.tar.xz alpine_aports-ba0d340317d760230150038f8c6252a166dd11ff.zip | |
main/*-grsec: enable CRYPTO_DEV_GEODE
(cherry picked from commit 78ca6319638430577850e60eefa2ef6142777f58)
| -rw-r--r-- | main/dahdi-linux-grsec/APKBUILD | 2 | ||||
| -rw-r--r-- | main/linux-grsec/APKBUILD | 4 | ||||
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 2 | ||||
| -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 |
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 @@ | |||
| 3 | 3 | ||
| 4 | _flavor=grsec | 4 | _flavor=grsec |
| 5 | _kver=3.0.9 | 5 | _kver=3.0.9 |
| 6 | _kpkgrel=1 | 6 | _kpkgrel=2 |
| 7 | _mypkgrel=0 | 7 | _mypkgrel=0 |
| 8 | 8 | ||
| 9 | # verify the kernel version before entering chroot | 9 | # 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 | |||
| 4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
| 5 | pkgver=3.0.9 | 5 | pkgver=3.0.9 |
| 6 | _kernver=3.0 | 6 | _kernver=3.0 |
| 7 | pkgrel=1 | 7 | pkgrel=2 |
| 8 | pkgdesc="Linux kernel with grsecurity" | 8 | pkgdesc="Linux kernel with grsecurity" |
| 9 | url=http://grsecurity.net | 9 | url=http://grsecurity.net |
| 10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
| @@ -144,5 +144,5 @@ md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 | |||
| 144 | c41cf0ee9794f393423c6b2093072260 grsec-timblogiw-noconst.patch | 144 | c41cf0ee9794f393423c6b2093072260 grsec-timblogiw-noconst.patch |
| 145 | ebb99ef6ad8cd2d9fd8f49d5c5849057 0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch | 145 | ebb99ef6ad8cd2d9fd8f49d5c5849057 0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch |
| 146 | 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch | 146 | 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch |
| 147 | 36330138ac7e1e776b3917a81ba51546 kernelconfig.x86 | 147 | 57c444f3e8bb60a7f5782330bc450efa kernelconfig.x86 |
| 148 | f00f1c26ef7ddcdc4467bb883a71522b kernelconfig.x86_64" | 148 | 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 | |||
| 5247 | CONFIG_CRYPTO_DEV_PADLOCK=m | 5247 | CONFIG_CRYPTO_DEV_PADLOCK=m |
| 5248 | CONFIG_CRYPTO_DEV_PADLOCK_AES=m | 5248 | CONFIG_CRYPTO_DEV_PADLOCK_AES=m |
| 5249 | CONFIG_CRYPTO_DEV_PADLOCK_SHA=m | 5249 | CONFIG_CRYPTO_DEV_PADLOCK_SHA=m |
| 5250 | # CONFIG_CRYPTO_DEV_GEODE is not set | 5250 | CONFIG_CRYPTO_DEV_GEODE=m |
| 5251 | CONFIG_CRYPTO_DEV_HIFN_795X=m | 5251 | CONFIG_CRYPTO_DEV_HIFN_795X=m |
| 5252 | CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y | 5252 | CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y |
| 5253 | CONFIG_HAVE_KVM=y | 5253 | 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 | |||
| 4 | _realname=open-iscsi | 4 | _realname=open-iscsi |
| 5 | _realver=2.0-872 | 5 | _realver=2.0-872 |
| 6 | _kver=3.0.9 | 6 | _kver=3.0.9 |
| 7 | _kpkgrel=1 | 7 | _kpkgrel=2 |
| 8 | 8 | ||
| 9 | # verify the kernel version before entering chroot | 9 | # verify the kernel version before entering chroot |
| 10 | if [ -f ../linux-${_flavor}/APKBUILD ]; then | 10 | 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 | |||
| 7 | _realsubver=491607 | 7 | _realsubver=491607 |
| 8 | 8 | ||
| 9 | _kver=3.0.9 | 9 | _kver=3.0.9 |
| 10 | _kpkgrel=1 | 10 | _kpkgrel=2 |
| 11 | 11 | ||
| 12 | # source open-vm-tools version | 12 | # source open-vm-tools version |
| 13 | if [ -f ../main/$_realname/APKBUILD ]; then | 13 | 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 | |||
| 4 | _name=$_realname-$_flavor | 4 | _name=$_realname-$_flavor |
| 5 | 5 | ||
| 6 | _kver=3.0.9 | 6 | _kver=3.0.9 |
| 7 | _kpkgrel=1 | 7 | _kpkgrel=2 |
| 8 | 8 | ||
| 9 | # source the kernel version | 9 | # source the kernel version |
| 10 | if [ -f ../linux-$_flavor/APKBUILD ]; then | 10 | if [ -f ../linux-$_flavor/APKBUILD ]; then |