diff options
author | Matthew Thode <prometheanfire@gentoo.org> | 2012-04-26 16:48:15 -0400 |
---|---|---|
committer | Matthew Thode <prometheanfire@gentoo.org> | 2012-04-26 16:48:15 -0400 |
commit | 6a8f7b4e9ba29c32d5718636d0b5cd66e7a69c19 (patch) | |
tree | a219c6bf640fe92dbb4446c5e1d0962d5d21fb40 | |
parent | fix pax_uderef and pax_kernexec deps (also pax_randkstack) (diff) | |
download | hardened-patchset-6a8f7b4e9ba29c32d5718636d0b5cd66e7a69c19.tar.gz hardened-patchset-6a8f7b4e9ba29c32d5718636d0b5cd66e7a69c19.tar.bz2 hardened-patchset-6a8f7b4e9ba29c32d5718636d0b5cd66e7a69c19.zip |
revert patch
-rw-r--r-- | 3.3.3/4455_grsec-kconfig-gentoo.patch | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/3.3.3/4455_grsec-kconfig-gentoo.patch b/3.3.3/4455_grsec-kconfig-gentoo.patch index a4c1de3..ef59341 100644 --- a/3.3.3/4455_grsec-kconfig-gentoo.patch +++ b/3.3.3/4455_grsec-kconfig-gentoo.patch @@ -77,28 +77,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig + select GRKERNSEC_SYSCTL_ON + select PAX + select PAX_ASLR -+ select PAX_RANDKSTACK if (X86_TSC && X86) -+ select GRKERNSEC_DMESG -+ select GRKERNSEC_FORKFAIL -+ select GRKERNSEC_TIME -+ select GRKERNSEC_SIGNAL -+ select GRKERNSEC_CHROOT -+ select GRKERNSEC_CHROOT_SHMAT -+ select GRKERNSEC_CHROOT_UNIX -+ select GRKERNSEC_CHROOT_MOUNT -+ select GRKERNSEC_CHROOT_FCHDIR -+ select GRKERNSEC_CHROOT_PIVOT -+ select GRKERNSEC_CHROOT_DOUBLE -+ select GRKERNSEC_CHROOT_CHDIR -+ select GRKERNSEC_CHROOT_MKNOD -+ select GRKERNSEC_CHROOT_CAPS -+ select GRKERNSEC_CHROOT_SYSCTL -+ select GRKERNSEC_CHROOT_FINDTASK -+ select GRKERNSEC_SYSFS_RESTRICT -+ select GRKERNSEC_PROC -+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR) -+ select GRKERNSEC_HIDESYM -+ select GRKERNSEC_BRUTE ++ select PAX_RANDKSTACK + select PAX_RANDUSTACK + select PAX_RANDMMAP + select PAX_NOEXEC @@ -106,8 +85,8 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig + select PAX_EI_PAX + select PAX_PT_PAX_FLAGS + select PAX_HAVE_ACL_FLAGS -+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) -+ select PAX_MEMORY_UDEREF if (X86 && !XEN) ++ select PAX_KERNEXEC ++ select PAX_MEMORY_UDEREF + select PAX_SEGMEXEC if (X86_32) + select PAX_PAGEEXEC + select PAX_EMUPLT if (ALPHA || PARISC || SPARC) @@ -183,7 +162,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig + select GRKERNSEC_SYSCTL_ON + select PAX + select PAX_ASLR -+ select PAX_RANDKSTACK if (X86_TSC && X86) ++ select PAX_RANDKSTACK + select PAX_RANDUSTACK + select PAX_RANDMMAP + select PAX_NOEXEC @@ -191,8 +170,8 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig + select PAX_EI_PAX + select PAX_PT_PAX_FLAGS + select PAX_HAVE_ACL_FLAGS -+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) -+ select PAX_MEMORY_UDEREF if (X86 && !XEN) ++ select PAX_KERNEXEC ++ select PAX_MEMORY_UDEREF + select PAX_SEGMEXEC if (X86_32) + select PAX_PAGEEXEC + select PAX_EMUPLT if (ALPHA || PARISC || SPARC) @@ -268,7 +247,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig + select GRKERNSEC_SYSCTL_ON + select PAX + select PAX_ASLR -+ select PAX_RANDKSTACK if (X86_TSC && X86) ++ select PAX_RANDKSTACK + select PAX_RANDUSTACK + select PAX_RANDMMAP + select PAX_NOEXEC |