SPECS (LINUX_2_6): kernel.spec - unionfs 2.1.4; vserver changes fo...

[zbyniu]

Author: zbyniu                       Date: Thu Sep 20 17:49:41 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- unionfs 2.1.4; vserver changes for unionfs into patch 141

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1784 -> 1.441.2.1785) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1784 SPECS/kernel.spec:1.441.2.1785
--- SPECS/kernel.spec:1.441.2.1784	Fri Sep 14 15:53:36 2007
+++ SPECS/kernel.spec	Thu Sep 20 19:49:35 2007
@@ -321,8 +321,9 @@
 # Fix verified for that kernel version.
 Patch130:	linux-2.6-forcedeth-WON.patch
 
-# http://download.filesystems.org/unionfs/unionfs-2.1/unionfs-2.1.1_for_2.6.22.3.diff.gz
+# http://download.filesystems.org/unionfs/unionfs-2.1/unionfs-2.1.4_for_2.6.22.6.diff.gz
 Patch140:	linux-2.6-unionfs-2.1.1.patch
+Patch141:	kernel-unionfs-vserver.patch
 
 Patch150:	linux-blk-race.patch
 
@@ -905,6 +906,7 @@
 
 # unionfs
 %patch140 -p1
+%{?with_vserver:%patch141 -p1}
 
 # aic94xx linux-2.6-aic94xx_with_included_firmware.patch
 %patch160 -p1
@@ -925,13 +927,13 @@
 
 %if %{with pax_full}
 %patch9999 -p1
-%patch10000 -p1
+%{?with_vserver:%patch10000 -p1}
 %{?with_vserver:%patch10001 -p1}
 %else
 
 %if %{with grsec_full}
 %patch9999 -p1
-%patch10000 -p1
+%{?with_vserver:%patch10000 -p1}
 %{?with_vserver:%patch10001 -p1}
 %else
 %if %{with grsec_minimal}
@@ -1663,6 +1665,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1785  2007/09/20 17:49:35  zbyniu
+- unionfs 2.1.4; vserver changes for unionfs into patch 141
+
 Revision 1.441.2.1784  2007/09/14 13:53:36  aflinta
 - added aic94xx patch with included firmware
 
================================================================

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