SPECS (LINUX_2_6_22): kernel.spec - vserver patch up to 2.3.0.33; ...

[zbyniu]

Author: zbyniu                       Date: Mon Mar 17 01:29:46 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- vserver patch up to 2.3.0.33; rel 5

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.66 -> 1.441.2.1796.2.67) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.66 SPECS/kernel.spec:1.441.2.1796.2.67
--- SPECS/kernel.spec:1.441.2.1796.2.66	Thu Mar 13 22:15:09 2008
+++ SPECS/kernel.spec	Mon Mar 17 02:29:40 2008
@@ -103,7 +103,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			4
+%define		_rel			5
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_enable_debug_packages			0
@@ -294,13 +294,9 @@
 # http://www.citi.umich.edu/projects/nfsv4/linux/kernel-patches/2.6.22-rc5-1/linux-2.6.22-rc5-CITI_NFS4_ALL-1.diff
 Patch91:	linux-2.6.22-rc5-CITI_NFS4_ALL-1.diff
 
-# based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.9-vs2.3.0.26.diff
-# currently based on http://people.linux-vserver.org/~dhozac/p/k/patch-2.6.22.16-vs2.3.0.29.2.diff
+# based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.19-vs2.3.0.33.diff
 Patch100:	linux-2.6-vs2.3.patch
 Patch101:	linux-2.6-vs2.1-suspend2.patch
-# http://vserver.13thfloor.at/Experimental/delta-lback-feat02.diff
-Patch103:	kernel-vserver-lback-feat02.patch
-Patch104:	kernel-vserver-inet_diag.patch
 # based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.2-vs2.2.0.3.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)
@@ -903,8 +899,6 @@
 %patch102 -p1
 %else
 %patch100 -p1
-%patch103 -p1
-%patch104 -p1
 %endif
 %if %{with suspend2}
 #ifarch %{ix86} %{x8664} ia64
@@ -1717,6 +1711,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.67  2008-03-17 01:29:40  zbyniu
+- vserver patch up to 2.3.0.33; rel 5
+
 Revision 1.441.2.1796.2.66  2008-03-13 21:15:09  zbyniu
 - rtsp-conntrack/nat is back
 
================================================================

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