From 99a31a51ab107e89bc8fc86e591c0adc5d51e3ac Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Tue, 19 Oct 2010 11:09:42 +0200
Subject: [PATCH] grsecurity: rediffed gradm Makefile patch to cleanly apply on
 current gradm sources

---
 security/grsecurity/gradm-Makefile-fix.patch | 34 +++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/security/grsecurity/gradm-Makefile-fix.patch b/security/grsecurity/gradm-Makefile-fix.patch
index cf6ed9fc0..86a3dfffe 100644
--- a/security/grsecurity/gradm-Makefile-fix.patch
+++ b/security/grsecurity/gradm-Makefile-fix.patch
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../grsecurity/gradm-Makefile-fix.patch
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -38,3 +38,35 @@
  	@true
  
  clean:
+--- gradm2/Makefile.orig	2010-05-04 16:03:43.000000000 +0200
++++ gradm2/Makefile	2010-10-12 18:17:42.416002009 +0200
+@@ -127,29 +127,14 @@
+ 	@if [ ! -f $(DESTDIR)$(GRSEC_DIR)/learn_config ] ; then \
+ 		$(INSTALL) -m 0600 learn_config $(DESTDIR)$(GRSEC_DIR) ; \
+ 	fi
+-	@if [ -z "`cut -d" " -f3 /proc/mounts | grep "^devfs"`" ] ; then \
+-		rm -f $(DESTDIR)/dev/grsec ; \
+-		if [ ! -e $(DESTDIR)/dev/grsec ] ; then \
+-			mkdir -p $(DESTDIR)/dev ; \
+-			$(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 13 ; \
+-		fi \
+-	fi
+ 	@if [ -d $(DESTDIR)/etc/udev/rules.d ] ; then \
+ 		echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
+ 		echo "KERNEL==\"grsec\",          MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
+ 		echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
+ 	fi
+-	@if [ -f $(DESTDIR)/sbin/udevadm ] ; then \
+-		$(DESTDIR)/sbin/udevadm trigger --action=change ; \
+-	fi
+ 	@echo "Installing gradm manpage..."
+ 	@mkdir -p $(DESTDIR)$(MANDIR)/man8
+ 	@$(INSTALL) -m 0644 gradm.8 $(DESTDIR)$(MANDIR)/man8/$(GRADM_BIN).8
+-	@if [ -x /sbin/$(GRADM_BIN) ] ; then \
+-		if [ -z $(DESTDIR) ] && [ ! -f $(GRSEC_DIR)/pw ] ; then \
+-			/sbin/$(GRADM_BIN) -P ; \
+-		fi \
+-	fi
+ 	@true
+ 
+ clean: