SPECS (LINUX_2_6_16): kernel.spec - 2.6.16.27-2 - added pax bcond

[mguevara]

Author: mguevara                     Date: Thu Jul 20 16:11:08 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- 2.6.16.27-2 - added pax bcond

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.18 -> 1.441.2.1558.2.19) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.18 SPECS/kernel.spec:1.441.2.1558.2.19
--- SPECS/kernel.spec:1.441.2.1558.2.18	Mon Jul 17 16:18:15 2006
+++ SPECS/kernel.spec	Thu Jul 20 18:11:02 2006
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
 #
 # TODO:
+#	- test pax stuff (btw. tested ok in softmode)
+#	- prepare config for non SEGMEXEC capable archs (ie not x86/32bit)
 #	- patch scripts/Makefile.xen not to require bash
 #       - make PAE usage configurable when Xen is on
 #		ALL
@@ -13,6 +15,7 @@
 %bcond_without	pcmcia		# don't build pcmcia
 
 %bcond_with	grsec_full	# build full grsecurity
+%bcond_with	pax		# build PaX and full grsecurity
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	xen0		# added Xen0 support
 %bcond_with	xenU		# added XenU support
@@ -29,6 +32,13 @@
 %if %{without grsecurity}
 %undefine	with_grsec_full
 %undefine	with_grsec_minimal
+%undefine	with_pax
+%endif
+
+%if %{with pax}
+%undefine	with_grsec_minimal
+%undefine	with_grsec_full
+%define		with_grsecurity		1
 %endif
 
 %if %{with grsec_full}
@@ -38,6 +48,7 @@
 
 %if %{with grsec_minimal}
 %undefine	with_grsec_full
+%undefine	with_pax
 %define		with_grsecurity		1
 %endif
 
@@ -102,7 +113,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			1
+%define		_rel			2
 
 %define		_netfilter_snap		20060504
 %define		_nf_hipac_ver		0.9.1
@@ -123,7 +134,7 @@
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(fr):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl):	Jądro Linuksa
-Name:		kernel%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
+Name:		kernel%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 %define		_basever	2.6.16
 %define		_postver	.27
 Version:	%{_basever}%{_postver}
@@ -170,7 +181,7 @@
 Source46:	kernel-xen0.config
 Source47:	kernel-xenU.config
 Source48:	kernel-xen-extra.config
-
+Source49:	kernel-grsec+pax.config
 ###
 #	Patches
 ###
@@ -812,6 +823,10 @@
 %patch9999 -p1
 %endif
 
+%if %{with pax}
+%patch9999 -p1
+%endif
+
 %ifarch ppc ppc64
 %patch200 -p1
 %endif
@@ -924,7 +939,11 @@
 	cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig
 
 %if %{with grsecurity}
-	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
+	%if %{with pax}
+		cat %{SOURCE49} >> arch/%{_target_base_arch}/defconfig
+	%else
+		cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
+	%endif
 %endif
 
 %if %{with xen0} || %{with xenU}
@@ -1219,7 +1238,7 @@
 		title='PLD Linux'
 	fi
 
-	ext='%{?with_grsec_full:grsecurity}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
+	ext='%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
 	if [ "$ext" ]; then
 		title="$title $ext"
 	fi
@@ -1293,7 +1312,7 @@
 		title='PLD Linux'
 	fi
 
-	ext='%{?with_grsec_full:grsecurity}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
+	ext='%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
 	if [ "$ext" ]; then
 		title="$title $ext"
 	fi
@@ -1662,6 +1681,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.19  2006/07/20 16:11:02  mguevara
+- 2.6.16.27-2 - added pax bcond
+
 Revision 1.441.2.1558.2.18  2006/07/17 14:18:15  pluto
 - updated to 2.6.16.27.
   USB serial ftdi_sio: Prevent userspace DoS (CVE-2006-2936)
================================================================

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