Author: baggins Date: Mon Sep 19 15:58:05 2005 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- readded grsec_basic, as some of us need at least this functionality
when full grsec is not possible (e.g. with vserver)
---- Files affected:
SPECS:
kernel.spec (1.441.2.1211 -> 1.441.2.1212)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1211 SPECS/kernel.spec:1.441.2.1212
--- SPECS/kernel.spec:1.441.2.1211 Mon Sep 19 16:21:43 2005
+++ SPECS/kernel.spec Mon Sep 19 17:57:59 2005
@@ -10,6 +10,8 @@
%bcond_without source # don't build kernel-source package
%bcond_without pcmcia # don't build pcmcia
%bcond_without grsecurity # disable grsecurity
+%bcond_with grsec_basic # enable basic grsecurity functionality
(proc,link,fifo)
+ # bcond only valid "without grsecurity"
%bcond_with pax # enable PaX (depends on grsecurity)
%bcond_with omosix # enable openMosix (conflicts with
grsecurity/vserver)
%bcond_with vserver # enable vserver (conflicts with
grsecurity/omosix)
@@ -747,6 +749,8 @@
%if %{with grsecurity}
%patch200 -p1
+%else
+%{?with_grsec_basic:%patch199 -p1}
%endif
%if %{with omosix}
%{__patch} -p1 -F3 < %{PATCH201}
@@ -888,6 +892,10 @@
%if %{with grsecurity}
cat %{!?with_pax:%{SOURCE90}}%{?with_pax:%{SOURCE91}} >>
arch/%{_target_base_arch}/defconfig
+%else
+%if %{with grsec_basic}
+ cat %{SOURCE90} >> arch/%{_target_base_arch}/defconfig
+%endif
%endif
%if %{with omosix}
cat %{SOURCE92} >> arch/%{_target_base_arch}/defconfig
@@ -1536,6 +1544,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1212 2005/09/19 15:57:59 baggins
+- readded grsec_basic, as some of us need at least this functionality
+ when full grsec is not possible (e.g. with vserver)
+
Revision 1.441.2.1211 2005/09/19 14:21:43 pluto
- ppc64 build added, configs need review.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1211&r2=1.441.2.1212&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
