SPECS (LINUX_2_6_17): kernel.spec - 2.6.17.13-3 - initial PaX supp...

[mguevara]

Author: mguevara                     Date: Wed Sep 27 21:15:15 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_17
---- Log message:
- 2.6.17.13-3 - initial PaX support (bcond), separate configs for grsecurity
  and pax, 
- patch75 linux-2.6.15_ide-gtm-stm.diff for s3 ide wake-up on hp nx8200, 
- patch80 linux-2.6.17-cx88-tvaudio.patch fixes audio on blackbird tv cards

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1613.2.2 -> 1.441.2.1613.2.3) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1613.2.2 SPECS/kernel.spec:1.441.2.1613.2.3
--- SPECS/kernel.spec:1.441.2.1613.2.2	Mon Sep 25 22:33:18 2006
+++ SPECS/kernel.spec	Wed Sep 27 23:15:09 2006
@@ -2,6 +2,8 @@
 #
 # TODO:
 # - all netfilter patches needs update (API changed again)
+# - PaX support cleanup
+# - separate PaX and grsecurity support
 #
 # WARNING: Kernels from 2.6.16.X series not work under OldWorldMac
 #
@@ -13,6 +15,7 @@
 
 %bcond_with	abi		# build ABI support only ix86 !!
 %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
@@ -31,6 +34,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}
@@ -41,6 +51,7 @@
 %if %{with grsec_minimal}
 %undefine	with_grsec_full
 %define		with_grsecurity		1
+%undefine	with_pax
 %endif
 
 %ifarch sparc
@@ -93,7 +104,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			2
+%define		_rel			3
 
 %define		_old_netfilter_snap	20060504
 %define		_netfilter_snap		20060829
@@ -115,7 +126,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.17
 %define		_postver	.13
 #define		_postver	%{nil}
@@ -170,6 +181,8 @@
 Source46:	kernel-xen0.config
 Source47:	kernel-xenU.config
 Source48:	kernel-xen-extra.config
+Source49:       kernel-pax.config
+Source50:	kernel-no-pax.config
 
 ###
 #	Patches
@@ -261,6 +274,10 @@
 Patch70:	linux-2.6-suspend2-avoid-redef.patch
 Patch71:	linux-2.6-suspend2-page.patch
 
+# ide s3 wakeup for hp nx8220 notebooks
+# from http://hehe.pl/drg/trash/nx8220-s3/
+Patch75:	linux-2.6.15_ide-gtm-stm.diff
+
 # cx88-blackbird based tv tuner card audio fix
 Patch80:        linux-2.6.17-cx88-tvaudio.patch
 
@@ -887,6 +904,10 @@
 
 %patch60 -p1
 
+# ide s3 wakeup on hp nx8220
+%patch75 -p1 
+
+# cx88-tvaudio
 %patch80 -p1
 
 # vserver:
@@ -907,6 +928,10 @@
 %patch9999 -p1
 %endif
 
+%if %{with pax}
+%patch9999 -p1
+%endif
+
 %ifarch ppc ppc64
 %patch200 -p1
 %endif
@@ -1034,6 +1059,12 @@
 	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
 %endif
 
+%if %{with pax}
+	cat %{SOURCE49} >> arch/%{_target_base_arch}/defconfig
+%else
+	cat %{SOURCE50} >> arch/%{_target_base_arch}/defconfig
+%endif
+
 %if %{with xen0} || %{with xenU}
 	sed -i "s:CONFIG_X86_PC=y:# CONFIG_X86_PC is not set:" arch/%{_target_base_arch}/defconfig
 	sed -i "s:CONFIG_RIO=[ym]:# CONFIG_RIO is not set:" arch/%{_target_base_arch}/defconfig
@@ -1331,7 +1362,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
@@ -1403,7 +1434,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
@@ -1783,6 +1814,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1613.2.3  2006/09/27 21:15:09  mguevara
+- 2.6.17.13-3 - initial PaX support (bcond), separate configs for grsecurity
+  and pax,
+- patch75 linux-2.6.15_ide-gtm-stm.diff for s3 ide wake-up on hp nx8200,
+- patch80 linux-2.6.17-cx88-tvaudio.patch fixes audio on blackbird tv cards
+
 Revision 1.441.2.1613.2.2  2006/09/25 20:33:18  mguevara
 - 2.6.17.13-2 - adds patch80 linux-2.6.17-cx88-tvaudio.patch
 
================================================================

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