[linux] 02/02: grsecurity: Delete empty stub Kconfig and Makefile

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit a16ba746272570a4c35203bc843a4e2ab97b04eb
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Oct 5 22:26:02 2016 +0100

    grsecurity: Delete empty stub Kconfig and Makefile
    
    Whatever features we get from Grsecurity in future are almost certain
    to come via KSPP, so these aren't going to be useful.
---
 .../all/grsecurity/grsecurity-kbuild.patch         | 42 -------------------
 .../all/grsecurity/grsecurity-kconfig.patch        | 47 ----------------------
 debian/patches/series                              |  5 ---
 3 files changed, 94 deletions(-)

diff --git a/debian/patches/features/all/grsecurity/grsecurity-kbuild.patch b/debian/patches/features/all/grsecurity/grsecurity-kbuild.patch
deleted file mode 100644
index 81fcf2d..0000000
--- a/debian/patches/features/all/grsecurity/grsecurity-kbuild.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Subject: grsecurity: Kbuild integration
-Origin: https://grsecurity.net/test/grsecurity-3.1-4.1.3-201507261932.patch
-
-Kbuild integration changes extracted from Grsecurity.
-
-Subsequent patches will add to the empty Makefile.
-
---- a/Makefile
-+++ b/Makefile
-@@ -887,7 +887,7 @@ export mod_sign_cmd
- 
- 
- ifeq ($(KBUILD_EXTMOD),)
--core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
- 
- vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
- 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
---- /dev/null
-+++ b/grsecurity/Makefile
-@@ -0,0 +1,20 @@
-+# grsecurity – access control and security hardening for Linux
-+# All code in this directory and various hooks located throughout the Linux kernel are
-+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
-+# http://www.grsecurity.net spender at grsecurity.net
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License version 2
-+# as published by the Free Software Foundation.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+
-+KBUILD_CFLAGS += -Werror
-+
diff --git a/debian/patches/features/all/grsecurity/grsecurity-kconfig.patch b/debian/patches/features/all/grsecurity/grsecurity-kconfig.patch
deleted file mode 100644
index 1211284..0000000
--- a/debian/patches/features/all/grsecurity/grsecurity-kconfig.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Subject: grsecurity: Kconfig integration
-Origin: https://grsecurity.net/test/grsecurity-3.1-4.1.3-201507261932.patch
-
-Kconfig integration changes extracted from Grsecurity, with help
-strings changed to make it clear that is not the real thing.
-
-Subsequent patches will add to the empty menu.
-
----
---- /dev/null
-+++ b/grsecurity/Kconfig
-@@ -0,0 +1,3 @@
-+#
-+# grecurity configuration
-+#
---- a/security/Kconfig
-+++ b/security/Kconfig
-@@ -4,6 +4,28 @@
- 
- menu "Security options"
- 
-+menu "Hardening features (from Grsecurity)"
-+
-+config GRKERNSEC
-+	bool "Hardening features (from Grsecurity)"
-+	select DEBUG_KERNEL
-+	select DEBUG_LIST
-+	help
-+	  If you say Y here, you will be able to configure many features
-+	  that will enhance the security of your system.  It is highly
-+	  recommended that you say Y here and read through the help
-+	  for each option so that you fully understand the features and
-+	  can evaluate their usefulness for your machine.
-+
-+menu "Customize Configuration"
-+depends on GRKERNSEC
-+
-+source grsecurity/Kconfig
-+
-+endmenu
-+
-+endmenu
-+
- source security/keys/Kconfig
- 
- config SECURITY_DMESG_RESTRICT
diff --git a/debian/patches/series b/debian/patches/series
index ce01a51..4d4bbd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -65,11 +65,6 @@ bugfix/all/ext4-fix-bug-838544.patch
 
 # Miscellaneous features
 
-# Hardening from grsecurity
-features/all/grsecurity/grsecurity-kconfig.patch
-# Disabled until we add code into the grsecurity/ directory
-#features/all/grsecurity/grsecurity-kbuild.patch
-
 # Securelevel patchset from mjg59
 features/all/securelevel/add-bsd-style-securelevel-support.patch
 features/all/securelevel/enforce-module-signatures-when-securelevel-is-greate.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git