From 7a411f6fa191f497187eb25fdcec7fa961d7a827 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 8 Dec 2011 08:56:50 +0100
Subject: main/linux-grsec: enable DMAR on x86_64

for Xen
---
 main/dahdi-linux-grsec/APKBUILD      | 2 +-
 main/linux-grsec/APKBUILD            | 4 ++--
 main/linux-grsec/kernelconfig.x86_64 | 8 ++++++--
 main/open-iscsi-grsec/APKBUILD       | 2 +-
 main/open-vm-tools-grsec/APKBUILD    | 2 +-
 main/xtables-addons-grsec/APKBUILD   | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index fe6ac49da..2299202a2 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -3,7 +3,7 @@
 
 _flavor=grsec
 _kver=3.0.12
-_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 715cf00be..82023d60e 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=1
+pkgrel=2
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -145,4 +145,4 @@ 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
 587b1fb2f6a5c9ba714900b856f57f09  kernelconfig.x86
-0b7758a8c0fc63cdaa53330ace7d8402  kernelconfig.x86_64"
+99836ffe918bbdef7da1a56a3d075c7a  kernelconfig.x86_64"
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index ef5530227..44fb3e04b 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -46,6 +46,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
@@ -323,7 +324,7 @@ CONFIG_GART_IOMMU=y
 # CONFIG_AMD_IOMMU is not set
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
-# CONFIG_IOMMU_API is not set
+CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=32
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -495,7 +496,9 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_CNB20LE_QUIRK=y
-# CONFIG_DMAR is not set
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_FLOPPY_WA=y
 # CONFIG_INTR_REMAP is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
@@ -5089,6 +5092,7 @@ CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set
 # CONFIG_SECURITY_PATH is not set
+# CONFIG_INTEL_TXT is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_IMA is not set
diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD
index 752d3a6d0..9d20e19a4 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=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 f946dba42..9bad72444 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=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 2f5dbc558..62dd7d0e3 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=1
+_kpkgrel=2
 
 # source the kernel version
 if [ -f ../linux-$_flavor/APKBUILD ]; then
-- 
cgit v1.2.3