packages: kernel/kernel-grsec_fixes.patch, kernel/kernel.spec, kernel/kerne...

[arekm]

Author: arekm                        Date: Wed Dec 16 10:44:04 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge ernel-grsec-no-stupid-SbO.patch into kernel-grsec_fixes.patch

---- Files affected:
packages/kernel:
   kernel-grsec_fixes.patch (1.4 -> 1.5) , kernel.spec (1.739 -> 1.740) , kernel-grsec-no-stupid-SbO.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_fixes.patch
diff -u packages/kernel/kernel-grsec_fixes.patch:1.4 packages/kernel/kernel-grsec_fixes.patch:1.5
--- packages/kernel/kernel-grsec_fixes.patch:1.4	Wed Dec 16 11:42:43 2009
+++ packages/kernel/kernel-grsec_fixes.patch	Wed Dec 16 11:43:59 2009
@@ -135,3 +135,17 @@
  		write_unlock(&fs_vxi->lock);
  	}
  
+--- linux-2.6.28/fs/proc/Kconfig~       2008-11-20 23:26:34.000000000 +0100
++++ linux-2.6.28/fs/proc/Kconfig        2008-12-01 20:37:12.000000000 +0100
+@@ -59,8 +59,8 @@
+ 	  limited in memory.
+ 
+ config PROC_PAGE_MONITOR
+- 	default n
+-	depends on PROC_FS && MMU && !GRKERNSEC
++ 	default y
++	depends on PROC_FS && MMU
+ 	bool "Enable /proc page monitoring" if EMBEDDED
+  	help
+ 	  Various /proc files exist to monitor process memory utilization:
+

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.739 packages/kernel/kernel.spec:1.740
--- packages/kernel/kernel.spec:1.739	Wed Dec 16 11:42:43 2009
+++ packages/kernel/kernel.spec	Wed Dec 16 11:43:59 2009
@@ -327,7 +327,6 @@
 Patch10000:	kernel-grsec-caps.patch
 Patch10001:	kernel-grsec-common.patch
 Patch10002:	kernel-grsec_fixes.patch
-Patch10003:	kernel-grsec-no-stupid-SbO.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.18
@@ -834,7 +833,6 @@
 %{?with_vserver:%patch10000 -p1}
 %{?with_vserver:%patch10001 -p1}
 %{?with_vserver:%patch10002 -p1}
-%{?with_vserver:%patch10003 -p1}
 %endif
 %endif
 #
@@ -1546,6 +1544,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.740  2009/12/16 10:43:59  arekm
+- merge ernel-grsec-no-stupid-SbO.patch into kernel-grsec_fixes.patch
+
 Revision 1.739  2009/12/16 10:42:43  arekm
 - fixes for grsec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_fixes.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.739&r2=1.740&f=u