SPECS (hawk-LINUX_2_6): kernel.spec - PaX bconds and configs - cos...

[hawk]

Author: hawk                         Date: Sun Jan 28 12:24:46 2007 GMT
Module: SPECS                         Tag: hawk-LINUX_2_6
---- Log message:
- PaX bconds and configs
- cosmetics

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1701.2.4 -> 1.441.2.1701.2.5) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1701.2.4 SPECS/kernel.spec:1.441.2.1701.2.5
--- SPECS/kernel.spec:1.441.2.1701.2.4	Sun Jan 28 12:43:16 2007
+++ SPECS/kernel.spec	Sun Jan 28 13:24:40 2007
@@ -10,6 +10,7 @@
 
 %bcond_without	grsec_minimal	# build minimal grsecurity subset (proc,link,fifo,shm)
 %bcond_with	grsec_full	# build full grsecurity
+%bcond_with	pax		# build PaX (requires full grsecurity)
 
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
@@ -18,18 +19,24 @@
 %if %{without grsecurity}
 %undefine	with_grsec_full
 %undefine	with_grsec_minimal
+%undefine	with_pax
 %endif
 
 %if %{with grsec_full}
 %undefine	with_grsec_minimal
 %define		with_grsecurity		1
 %endif
-																						     
+
 %if %{with grsec_minimal}																			    
 %undefine	with_grsec_full
+%undefine	with_pax
 %define		with_grsecurity		1
 %endif
 
+%if %{without grsec_full}
+%undefine	with_pax
+%endif
+
 %{?debug:%define with_verbose 1}
 
 %ifnarch %{ix86}
@@ -113,6 +120,8 @@
 Source42:	kernel-netfilter.config
 Source43:	kernel-vserver.config
 Source44:	kernel-grsec.config
+Source45:	kernel-pax.config
+Source46:	kernel-no-pax.config
 
 # http://vserver.13thfloor.at/Experimental/patch-2.6.19.2-vs2.3.0.7.diff
 Patch100:	linux-2.6-vs2.3.patch
@@ -660,6 +669,27 @@
 %endif
 }
 
+PaXconfig () {
+	set -x
+	%ifarch %{ix86}
+		sed -i 's:# CONFIG_PAX_SEGMEXEC is not set:CONFIG_PAX_SEGMEXEC=y:' $1
+		sed -i 's:# CONFIG_PAX_DEFAULT_SEGMEXEC is not set:CONFIG_PAX_DEFAULT_SEGMEXEC=y:' $1
+		%ifnarch i386 i486
+			sed -i 's:# CONFIG_PAX_NOVSYSCALL is not set:CONFIG_PAX_NOVSYSCALL=y:' $1
+		%endif
+	%endif
+	%ifarch ppc64
+		sed -i 's:CONFIG_PAX_NOELFRELOCS=y:# CONFIG_PAX_NOELFRELOCS is not set:' $1
+	%endif
+	%ifarch ppc
+		sed -i 's:# CONFIG_PAX_EMUTRAMP is not set:CONFIG_PAX_EMUTRAMP=y:' $1
+	%endif
+	%ifarch %{ix8664}
+		sed -i 's:# CONFIG_PAX_MEMORY_UDEREF is not set:# CONFIG_PAX_MEMORY_UDEREF=y:' $1
+	%endif
+	return 0
+}
+
 rm -f .config
 BuildConfig() {
 	%{?debug:set -x}
@@ -679,7 +709,7 @@
 
 	echo "" > .config
 	%ifnarch alpha sparc sparc64
-	cat %{SOURCE20} > .config
+		cat %{SOURCE20} > .config
 	%endif
 	cat $RPM_SOURCE_DIR/kernel-$Config.config >> .config
 	echo "CONFIG_LOCALVERSION=\"-%{_localversion}$smp\"" >> .config
@@ -694,11 +724,18 @@
 	cat %{SOURCE42} >> .config
 
 	%if %{with vserver}
-	cat %{SOURCE43} >> .config
+		cat %{SOURCE43} >> .config
 	%endif
 
 	%if %{with grsecurity}
-	cat %{SOURCE44} >> .config
+		cat %{SOURCE44} >> .config
+	%endif
+
+	%if %{with pax}
+		cat %{SOURCE45} >> .config
+		PaXconfig .config
+	%else   
+		cat %{SOURCE46} >> .config
 	%endif
 
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" .config}
@@ -1337,6 +1374,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1701.2.5  2007/01/28 12:24:40  hawk
+- PaX bconds and configs
+- cosmetics
+
 Revision 1.441.2.1701.2.4  2007/01/28 11:43:16  hawk
 - proper name depending on conditional builds
 - fixed grsecurity/vserver config inclusion
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1701.2.4&r2=1.441.2.1701.2.5&f=u