Author: cieciwa Date: Mon Jan 16 12:20:13 2006 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - reconfigure grsecurity/grsecurity_basic [one of them are always applayed]
---- Files affected: SPECS: kernel.spec (1.441.2.1371 -> 1.441.2.1372) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1371 SPECS/kernel.spec:1.441.2.1372 --- SPECS/kernel.spec:1.441.2.1371 Sun Jan 15 22:14:53 2006 +++ SPECS/kernel.spec Mon Jan 16 13:20:07 2006 @@ -12,8 +12,6 @@ %bcond_without pcmcia # don't build pcmcia %bcond_with grsecurity # grsecurity - temporary %bcond_without pld_vers # disable pld-specific UTS_NAME changes -%bcond_with grsec_basic # 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) @@ -34,7 +32,7 @@ %endif %if %{with vserver} -%define with_grsec_basic 1 +%undefine grsecurity %endif %if %{with xendev} && %{without xen} @@ -893,7 +891,7 @@ %if %{with grsecurity} %patch200 -p1 %else -%{?with_grsec_basic:%patch199 -p1} +%patch199 -p1 %endif %if %{with omosix} %{__patch} -p1 -F3 < %{PATCH201} @@ -1057,10 +1055,8 @@ sed -i 's:CONFIG_KALLSYMS_EXTRA_PASS=y:# CONFIG_KALLSYMS_EXTRA_PASS is not set:' arch/%{_target_base_arch}/defconfig %endif %else -%if %{with grsec_basic} cat %{SOURCE90} >> arch/%{_target_base_arch}/defconfig %endif -%endif %if %{with omosix} cat %{SOURCE92} >> arch/%{_target_base_arch}/defconfig %endif @@ -1792,6 +1788,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.441.2.1372 2006/01/16 12:20:07 cieciwa +- reconfigure grsecurity/grsecurity_basic [one of them are always applayed] + Revision 1.441.2.1371 2006/01/15 21:14:53 charles - bootsplash updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1371&r2=1.441.2.1372&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit