SPECS (LINUX_2_6): kernel.spec - tproxy patch added, applied after vserver ...

[zbyniu]

Author: zbyniu                       Date: Wed May 14 17:36:09 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- tproxy patch added, applied after vserver because of small conflicts

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1898 -> 1.441.2.1899) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1898 SPECS/kernel.spec:1.441.2.1899
--- SPECS/kernel.spec:1.441.2.1898	Wed May 14 11:27:56 2008
+++ SPECS/kernel.spec	Wed May 14 19:36:03 2008
@@ -9,7 +9,6 @@
 # - update imq, owner-xid patch
 # - grsec_full awaits for new snap
 # - test bconds builds
-# - tproxy patch
 # - another nf modules disappeared?
 # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
 # - apparmor (no future?)
@@ -251,6 +250,9 @@
 # http://www.ssi.bg/~ja/nfct/ipvs-nfct-2.6.25-1.diff
 Patch41:	kernel-ipvs-nfct.patch
 
+# based on http://www.balabit.com/downloads/files/tproxy/tproxy-kernel-2.6.25-20080509-164605-1210344365.tar.bz2
+Patch42:	kernel-tproxy.patch
+
 ### End netfilter
 
 # based on http://www.linuximq.net/patchs/linux-2.6.24-imq.diff
@@ -874,6 +876,9 @@
 #%endif
 #%endif
 
+# tproxy
+%patch42 -p1
+
 # forcedeth:
 %patch130 -p1
 
@@ -1391,7 +1396,7 @@
 %depmod %{kernel_release}
 
 /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
-mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null}
+mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null
 %{?alt_kernel:mv -f %{initrd_dir}/initrd-%{alt_kernel}{,.old} 2> /dev/null}
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd
 %{?alt_kernel:ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}}
@@ -1682,6 +1687,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1899  2008-05-14 17:36:03  zbyniu
+- tproxy patch added, applied after vserver because of small conflicts
+
 Revision 1.441.2.1898  2008-05-14 09:27:56  lmasko
 - Cleaned mess in geninitrd line.
 
================================================================

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