SPECS (LINUX_2_6_13): kernel.spec - release 2 - updated vserver to...

[baggins]

Author: baggins                      Date: Tue Oct  4 17:52:52 2005 GMT
Module: SPECS                         Tag: LINUX_2_6_13
---- Log message:
- release 2
- updated vserver to 2.0.1pre2

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1221.2.2 -> 1.441.2.1221.2.3) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1221.2.2 SPECS/kernel.spec:1.441.2.1221.2.3
--- SPECS/kernel.spec:1.441.2.1221.2.2	Tue Oct  4 11:58:13 2005
+++ SPECS/kernel.spec	Tue Oct  4 19:52:47 2005
@@ -130,7 +130,7 @@
 %define		_oprofile_ver		0.5.3
 %define		_udev_ver		058
 
-%define		_rel		1
+%define		_rel		2
 
 %define		_netfilter_snap		20050915
 
@@ -330,6 +330,10 @@
 
 # vserver-2.0
 Patch300:	linux-2.6-vs2.patch
+Patch301:	http://vserver.13thfloor.at/Experimental/delta-rkill-feat01.diff
+Patch302:	http://vserver.13thfloor.at/Experimental/delta-rkill-fix01.diff
+Patch303:	http://vserver.13thfloor.at/Experimental/delta-rkill-fix02.diff
+Patch304:	http://vserver.13thfloor.at/Experimental/delta-rkill_debug-feat01.diff
 
 Patch400:	kernel-gcc4.patch
 Patch401:	kernel-hotfixes.patch
@@ -776,6 +780,13 @@
 %endif
 %endif
 
+%if %{with vserver}
+%patch300 -p1
+%patch301 -p1
+%patch302 -p1
+%patch303 -p1
+%patch304 -p1
+%endif
 %if %{with grsecurity}
 %patch200 -p1
 %else
@@ -784,9 +795,6 @@
 %if %{with omosix}
 %{__patch} -p1 -F3 < %{PATCH201}
 %endif
-%if %{with vserver}
-%patch300 -p1
-%endif
 %if %{with xen}
 %if %{with xendev}
 %patch204 -p1
@@ -1578,6 +1586,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1221.2.3  2005/10/04 17:52:47  baggins
+- release 2
+- updated vserver to 2.0.1pre2
+
 Revision 1.441.2.1221.2.2  2005/10/04 09:58:13  paszczus
 - updated to 2.6.13.3
 
================================================================

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