aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-08-03 12:23:29 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-08-03 12:24:03 +0000
commitf6f718575335c86eb6d93dcc8df345eab3da460b (patch)
tree9e0d516f5d2b5ff2f8df00c8cb9ebc636b9bf2d6 /main
parent86b2251a90894235baa382a9d1862f2de5062fa0 (diff)
downloadaports-f6f718575335c86eb6d93dcc8df345eab3da460b.tar.bz2
aports-f6f718575335c86eb6d93dcc8df345eab3da460b.tar.xz
main/linux-grsec: enable UDEREF on x86
Diffstat (limited to 'main')
-rw-r--r--main/dahdi-linux-grsec/APKBUILD1
-rw-r--r--main/iscsitarget-grsec/APKBUILD1
-rw-r--r--main/linux-grsec/APKBUILD5
-rw-r--r--main/linux-grsec/kernelconfig.x868
-rw-r--r--main/open-iscsi-grsec/APKBUILD1
-rw-r--r--main/open-vm-tools-grsec/APKBUILD2
6 files changed, 10 insertions, 8 deletions
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index d11ebe14da..54516c5936 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -51,6 +51,7 @@ prepare() {
build() {
cd "$srcdir/$_realname-$_dahdiver"
+ export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \
|| return 1
}
diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD
index 1dc1be2be4..28445c377c 100644
--- a/main/iscsitarget-grsec/APKBUILD
+++ b/main/iscsitarget-grsec/APKBUILD
@@ -44,6 +44,7 @@ prepare() {
build() {
cd "$srcdir"/$_realname-$_iscsiver
unset ARCH
+ export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
make KSRC="$_ksrc" kernel || return 1
}
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 72e5127e05..750aa0f379 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
pkgname=linux-${_flavor}
pkgver=2.6.38.8
_kernver=2.6.38
-pkgrel=0
+pkgrel=1
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -69,6 +69,7 @@ menuconfig() {
build() {
cd "$srcdir"/build
+ export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
make CC="${CC:-gcc}" \
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \
|| return 1
@@ -141,5 +142,5 @@ c0f416f6a2e916633f697287cc7cb914 patch-2.6.38.8.bz2
58e1f9194fa75df9afdf2746370fa3cb grsecurity-2.2.2-2.6.38.8-unofficial.patch
776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
aa1b82da0cabfb41c5e6da5bddf60bab net-gre-provide-multicast-mappings-for-ipv4-and-ipv6.patch
-f4cf5b0ddfeef7aa87fb27792aff88a4 kernelconfig.x86
+991a83798618ad3318502116a8044d99 kernelconfig.x86
0a73d8d896101de90f47dae32119e7ca kernelconfig.x86_64"
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index f21ca50e0e..a648b9945e 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.38.6 Kernel Configuration
-# Thu May 19 13:36:21 2011
+# Linux/i386 2.6.38.8 Kernel Configuration
+# Wed Aug 3 08:43:09 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -49,7 +49,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_TRAMPOLINE=y
-CONFIG_X86_32_LAZY_GS=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_KTIME_SCALAR=y
CONFIG_ARCH_CPU_PROBE_RELEASE=y
@@ -416,7 +415,6 @@ CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
# CONFIG_EFI is not set
# CONFIG_SECCOMP is not set
-# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
CONFIG_HZ_300=y
@@ -4947,7 +4945,7 @@ CONFIG_PAX_RANDMMAP=y
#
# CONFIG_PAX_MEMORY_SANITIZE is not set
# CONFIG_PAX_MEMORY_STACKLEAK is not set
-# CONFIG_PAX_MEMORY_UDEREF is not set
+CONFIG_PAX_MEMORY_UDEREF=y
CONFIG_PAX_REFCOUNT=y
# CONFIG_PAX_USERCOPY is not set
CONFIG_KEYS=y
diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD
index 611761be9e..446682044f 100644
--- a/main/open-iscsi-grsec/APKBUILD
+++ b/main/open-iscsi-grsec/APKBUILD
@@ -40,6 +40,7 @@ prepare() {
build() {
cd "$_builddir"
unset ARCH
+ export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
make KSRC="$_ksrc" kernel || return 1
}
diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index ad2258c73d..37fbd6bb8f 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -65,5 +65,5 @@ package() {
done
}
-md5sums="aa2bd6533e1543c7cbda794db7365780 open-vm-tools-2011.06.27-437995.tar.gz
+md5sums="efe9b078045e9f7ea1e1311bf11857e6 open-vm-tools-2011.07.19-450511.tar.gz
afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd"