SPECS (LINUX_2_6_22): kernel.spec - rel 4; vserver up to 2.3.0.29.2

[arekm]

Author: arekm                        Date: Fri Jan 18 12:30:05 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- rel 4; vserver up to 2.3.0.29.2

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.39 -> 1.441.2.1796.2.40) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.39 SPECS/kernel.spec:1.441.2.1796.2.40
--- SPECS/kernel.spec:1.441.2.1796.2.39	Fri Jan 18 00:38:10 2008
+++ SPECS/kernel.spec	Fri Jan 18 13:29:59 2008
@@ -124,7 +124,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			3
+%define		_rel			4
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_netfilter_snap		20070806
@@ -253,9 +253,6 @@
 Patch22:	kernel-pom-ng-rsh.patch
 Patch23:	kernel-pom-ng-rpc.patch
 
-# http://people.linux-vserver.org/~dhozac/p/k/delta-nsproxy-fix01.diff
-Patch36:	kernel-nsproxy-fix.patch
-
 # http://ftp.linux-vserver.org/pub/people/dhozac/p/k/delta-owner-xid-feat02.diff
 Patch37:	kernel-owner-xid.patch
 
@@ -325,6 +322,7 @@
 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
 Patch100:	linux-2.6-vs2.3.patch
 Patch101:	linux-2.6-vs2.1-suspend2.patch
 # based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.2-vs2.2.0.3.diff
@@ -940,8 +938,6 @@
 %patch102 -p1
 %else
 %patch100 -p1
-# kernel-nsproxy-fix.patch
-%patch36 -p1
 %endif
 %if %{with suspend2}
 #ifarch %{ix86} %{x8664} ia64
@@ -1743,6 +1739,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.40  2008-01-18 12:29:59  arekm
+- rel 4; vserver up to 2.3.0.29.2
+
 Revision 1.441.2.1796.2.39  2008-01-17 23:38:10  glen
 - no pain provides for kernel-headers
 
================================================================

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