SPECS (LINUX_2_6_20): kernel.spec - rel 2 - vserver updated to vs2...

[mguevara]

Author: mguevara                     Date: Mon Apr  9 20:50:13 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_20
---- Log message:
- rel 2
- vserver updated to vs2.3.0.12: changes in linux-2.6-vs2.3.patch and
  grsecurity-2.1.10-2.6.20.3.patch, linux-2.6-vs2.3-quota.patch removed
  (changes included in 2.3.0.12)
- earlier fixes for nf_conntrack_mms.patch (just before rel 1)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1698.2.100 -> 1.441.2.1698.2.101) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1698.2.100 SPECS/kernel.spec:1.441.2.1698.2.101
--- SPECS/kernel.spec:1.441.2.1698.2.100	Mon Apr  9 01:16:54 2007
+++ SPECS/kernel.spec	Mon Apr  9 22:50:07 2007
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 #
-# STATUS: 2.6.20.4-1
+# STATUS: 2.6.20.6-1
 # - standard config includes vserver, suspend2 and grsec_minimal
 # - builds on i686 (Ac & Th)
 # - builds on x86_64 (Th)
@@ -8,7 +8,9 @@
 # - builds for alpha with crossalpha-gcc-4.0.1-1 (Th)
 # - builds --with vesafb_tng (i686)
 # - builds --with fbsplash (i686)
-# - builds --with pax_full and --with pax (i686/x86_64)
+# - builds --with pax_full (x86_64)
+# - builds --with pax (x86_64)
+# - builds --with grsec_full (x86_64)
 # - (external) nvidia works
 # - (external) nvidia-legacy works
 # - (external) ati firegl builds (but probably have issues)
@@ -142,7 +144,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			1
+%define		_rel			2
 
 %define		_netfilter_snap		20061213
 %define		_nf_hipac_ver		0.9.1
@@ -352,13 +354,10 @@
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	hostap-kernel-2.6.18.patch
 
-# based on http://vserver.13thfloor.at/Experimental/patch-2.6.20.1-vs2.3.0.11.diff
-# TODO: http://vserver.13thfloor.at/Experimental/patch-2.6.20.4-vs2.3.0.12.diff
+# based on http://vserver.13thfloor.at/Experimental/patch-2.6.20.4-vs2.3.0.12.diff
 Patch100:	linux-2.6-vs2.3.patch
 Patch101:	linux-2.6-vs2.1-suspend2.patch
 Patch102:	linux-2.6-vs2.1-128IPs.patch
-# Quota on vroot fix, reported upstream
-Patch103:	linux-2.6-vs2.3-quota.patch
 
 # from http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz
 #Patch120: xen-3.0-2.6.16.patch
@@ -917,7 +916,6 @@
 %patch101 -p1
 %endif
 %patch102 -p1
-%patch103 -p1
 %endif
 
 #%if %{with xen0} || %{with xenU}
@@ -1710,8 +1708,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.441.2.1698.2.100  2007/04/08 23:16:54  mguevara
-- up to 2.6.20.6 rel 1
+Revision 1.441.2.1698.2.101  2007/04/09 20:50:07  mguevara
+- rel 2
+- vserver updated to vs2.3.0.12: changes in linux-2.6-vs2.3.patch and
+  grsecurity-2.1.10-2.6.20.3.patch, linux-2.6-vs2.3-quota.patch removed
+  (changes included in 2.3.0.12)
+- earlier fixes for nf_conntrack_mms.patch (just before rel 1)
 
 Revision 1.441.2.1698.2.99  2007/04/06 15:36:42  zbyniu
 - status updated; newest grsec snap
================================================================

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