SPECS (LINUX_2_6): kernel.spec - experimental vserver 2.3 patch fo...

[zbyniu]

Author: zbyniu                       Date: Sun Mar 30 20:02:08 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- experimental vserver 2.3 patch for 2.6.24
- linux-2.6-vs2.1-suspend2.patch obsoleted; rel 0.2

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1858 -> 1.441.2.1859) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1858 SPECS/kernel.spec:1.441.2.1859
--- SPECS/kernel.spec:1.441.2.1858	Tue Mar 25 02:11:23 2008
+++ SPECS/kernel.spec	Sun Mar 30 22:02:02 2008
@@ -7,7 +7,6 @@
 #
 # TODO:
 # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
-# - vserver 2.3 (waiting for authors)
 # - apparmor (no future?)
 #
 # FUTURE:
@@ -114,7 +113,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			0.1
+%define		_rel			0.2
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_rescuecd:-rescuecd}
 
 %define		_enable_debug_packages			0
@@ -296,9 +295,9 @@
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	hostap-kernel-2.6.18.patch
 
-# there is no 2.3 for 2.6.24 yet
+# based on http://vserver.13thfloor.at/Experimental/patch-2.6.24.4-vs2.3.0.34.diff
 Patch100:	linux-2.6-vs2.3.patch
-Patch101:	linux-2.6-vs2.1-suspend2.patch
+Patch101:	kernel-vserver-fixes.patch
 # based on http://vserver.13thfloor.at/Experimental/patch-2.6.24-rc7-vs2.2.0.5.0.7-pre.diff
 Patch102:	linux-2.6-vs2.2.patch
 # note about vserver 2.2 vs 2.3: 2.2 is "stable", 2.3 is "development", currently (2007-09-03)
@@ -361,7 +360,7 @@
 # based on http://www.grsecurity.net/~paxguy1/pax-linux-2.6.24-test8.patch
 Patch9998:	kernel-pax.patch
 
-# based on http://www.grsecurity.net/~spender/grsecurity-2.1.11-2.6.24.2-200802192340.patch
+# based on http://www.grsecurity.net/~spender/grsecurity-2.1.11-2.6.24.4-200803242230.patch
 Patch9999:	linux-2.6-grsec_full.patch
 Patch10000:	linux-2.6-grsec-caps.patch
 Patch10001:	linux-2.6-grsec-common.patch
@@ -868,12 +867,7 @@
 %patch102 -p1
 %else
 %patch100 -p1
-%endif
-%if %{with tuxonice}
-#ifarch %{ix86} %{x8664} ia64
-# 2.6.24 temporaily disabled to test if still needed
-#%patch101 -p1
-#endif
+%patch101 -p1
 %endif
 %endif
 
@@ -1664,6 +1658,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1859  2008-03-30 20:02:02  zbyniu
+- experimental vserver 2.3 patch for 2.6.24
+- linux-2.6-vs2.1-suspend2.patch obsoleted; rel 0.2
+
 Revision 1.441.2.1858  2008-03-25 01:11:23  zbyniu
 - up to 2.6.24.4, if_addrlabel.h.patch obsoleted
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1858&r2=1.441.2.1859&f=u