Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2011-08-29 22:40:11 -0400
committerAnthony G. Basile <blueness@gentoo.org>2011-08-29 22:40:11 -0400
commit9fac4bbd5e39be69be7f3bcfcb18035766cbc1d2 (patch)
treec628908aecd3bd6febc16c486f5a40eef5130eb4
parent*/4435_grsec-kconfig-gentoo.patch: remove deprecated CONFIG_GRKERNSEC_EXECVE (diff)
downloadhardened-patchset-9fac4bbd5e39be69be7f3bcfcb18035766cbc1d2.tar.gz
hardened-patchset-9fac4bbd5e39be69be7f3bcfcb18035766cbc1d2.tar.bz2
hardened-patchset-9fac4bbd5e39be69be7f3bcfcb18035766cbc1d2.zip
Grsec/PaX: 2.2.2-2.6.32.45-201108281458 + 2.2.2-3.0.3-20110828145820110828
Diffstat
-rw-r--r--2.6.32/0000_README2
-rw-r--r--2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch (renamed from 2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108262310.patch)5
-rw-r--r--3.0.3/0000_README2
-rw-r--r--3.0.3/4420_grsecurity-2.2.2-3.0.3-201108281458.patch (renamed from 3.0.3/4420_grsecurity-2.2.2-3.0.3-201108262310.patch)24
4 files changed, 18 insertions, 15 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index f6d9728..61d9a15 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -11,7 +11,7 @@ Patch: 1044_linux-2.6.32.45.patch
From: http://www.kernel.org
Desc: Linux 2.6.39.45
-Patch: 4420_grsecurity-2.2.2-2.6.32.45-201108262310.patch
+Patch: 4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108262310.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch
index 0ce666e..1c7de41 100644
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108262310.patch
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch
@@ -76080,8 +76080,8 @@ diff -urNp linux-2.6.32.45/sound/usb/usbaudio.c linux-2.6.32.45/sound/usb/usbaud
}
diff -urNp linux-2.6.32.45/tools/gcc/constify_plugin.c linux-2.6.32.45/tools/gcc/constify_plugin.c
--- linux-2.6.32.45/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/tools/gcc/constify_plugin.c 2011-08-26 20:19:09.000000000 -0400
-@@ -0,0 +1,288 @@
++++ linux-2.6.32.45/tools/gcc/constify_plugin.c 2011-08-27 07:42:35.000000000 -0400
+@@ -0,0 +1,289 @@
+/*
+ * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
+ * Licensed under the GPL v2, or (at your option) v3
@@ -76106,6 +76106,7 @@ diff -urNp linux-2.6.32.45/tools/gcc/constify_plugin.c linux-2.6.32.45/tools/gcc
+#include "function.h"
+#include "tree-flow.h"
+#include "plugin.h"
++#include "diagnostic-core.h"
+//#include "c-tree.h"
+
+#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
diff --git a/3.0.3/0000_README b/3.0.3/0000_README
index b64e0c1..9b93d16 100644
--- a/3.0.3/0000_README
+++ b/3.0.3/0000_README
@@ -3,7 +3,7 @@ README
Individual Patch Descriptions:
-----------------------------------------------------------------------------
-Patch: 4420_grsecurity-2.2.2-3.0.3-201108262310.patch
+Patch: 4420_grsecurity-2.2.2-3.0.3-201108281458.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108262310.patch b/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108281458.patch
index 857914a..ea39dff 100644
--- a/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108262310.patch
+++ b/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108281458.patch
@@ -60436,7 +60436,7 @@ diff -urNp linux-3.0.3/localversion-grsec linux-3.0.3/localversion-grsec
+-grsec
diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
--- linux-3.0.3/Makefile 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/Makefile 2011-08-26 22:52:37.000000000 -0400
++++ linux-3.0.3/Makefile 2011-08-27 21:15:31.000000000 -0400
@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
@@ -60462,7 +60462,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
KBUILD_AFLAGS_KERNEL :=
KBUILD_CFLAGS_KERNEL :=
KBUILD_AFLAGS := -D__ASSEMBLY__
-@@ -564,6 +567,24 @@ else
+@@ -564,6 +567,25 @@ else
KBUILD_CFLAGS += -O2
endif
@@ -60472,8 +60472,9 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
+endif
+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN
-+gcc-plugins:
++gcc-plugins0:
+ $(Q)$(MAKE) $(build)=tools/gcc
++gcc-plugins: scripts_basic gcc-plugins0
+else
+gcc-plugins:
+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
@@ -60487,7 +60488,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
include $(srctree)/arch/$(SRCARCH)/Makefile
ifneq ($(CONFIG_FRAME_WARN),0)
-@@ -708,7 +729,7 @@ export mod_strip_cmd
+@@ -708,7 +730,7 @@ export mod_strip_cmd
ifeq ($(KBUILD_EXTMOD),)
@@ -60496,7 +60497,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -907,6 +928,7 @@ define rule_vmlinux-modpost
+@@ -907,6 +929,7 @@ define rule_vmlinux-modpost
endef
# vmlinux image - including updated kernel symbols
@@ -60504,7 +60505,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE
ifdef CONFIG_HEADERS_CHECK
$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
-@@ -973,7 +995,7 @@ ifneq ($(KBUILD_SRC),)
+@@ -973,7 +996,7 @@ ifneq ($(KBUILD_SRC),)
endif
# prepare2 creates a makefile if using a separate output directory
@@ -60513,7 +60514,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
include/config/auto.conf
-@@ -1087,6 +1109,7 @@ all: modules
+@@ -1087,6 +1110,7 @@ all: modules
# using awk while concatenating to the final file.
PHONY += modules
@@ -60521,7 +60522,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
@$(kecho) ' Building modules, stage 2.';
-@@ -1359,6 +1382,7 @@ PHONY += $(module-dirs) modules
+@@ -1359,6 +1383,7 @@ PHONY += $(module-dirs) modules
$(module-dirs): crmodverdir $(objtree)/Module.symvers
$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
@@ -60529,7 +60530,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
modules: $(module-dirs)
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1404,7 +1428,7 @@ clean: $(clean-dirs)
+@@ -1404,7 +1429,7 @@ clean: $(clean-dirs)
$(call cmd,rmdirs)
$(call cmd,rmfiles)
@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
@@ -69628,8 +69629,8 @@ diff -urNp linux-3.0.3/sound/usb/card.h linux-3.0.3/sound/usb/card.h
struct snd_usb_stream {
diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constify_plugin.c
--- linux-3.0.3/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/tools/gcc/constify_plugin.c 2011-08-26 19:49:56.000000000 -0400
-@@ -0,0 +1,288 @@
++++ linux-3.0.3/tools/gcc/constify_plugin.c 2011-08-27 07:43:46.000000000 -0400
+@@ -0,0 +1,289 @@
+/*
+ * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
+ * Licensed under the GPL v2, or (at your option) v3
@@ -69654,6 +69655,7 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
+#include "function.h"
+#include "tree-flow.h"
+#include "plugin.h"
++#include "diagnostic-core.h"
+//#include "c-tree.h"
+
+#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)