SPECS (LINUX_2_6): kernel.spec - rtsp-conntrack/nat is back

[zbyniu]

Author: zbyniu                       Date: Thu Mar 13 19:31:57 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- rtsp-conntrack/nat is back

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1851 -> 1.441.2.1852) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1851 SPECS/kernel.spec:1.441.2.1852
--- SPECS/kernel.spec:1.441.2.1851	Thu Mar 13 17:16:03 2008
+++ SPECS/kernel.spec	Thu Mar 13 20:31:51 2008
@@ -14,7 +14,6 @@
 # - update xen patch for 2.6.21
 # - Linux ABI - needs update.
 # - pom-ng quake3-conntrack-nat -> nf_conntrack ?
-# - pom-ng rtsp-conntrack -> nf_conntrack ?
 # - pom-ng talk-conntrack-nat -> nf_conntrack ?
 # - nf-hipac ?
 # - pax hooks for selinux (experimental)
@@ -116,7 +115,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			0.1
+%define		_rel			0.2
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_rescuecd:-rescuecd}
 
 %define		_enable_debug_packages			0
@@ -242,6 +241,9 @@
 Patch22:	kernel-pom-ng-rsh.patch
 Patch23:	kernel-pom-ng-rpc.patch
 
+# based on http://mike.it-loops.com/rtsp/rtsp-2.6.24.patch
+Patch36:	kernel-nf_rtsp.patch
+
 # http://ftp.linux-vserver.org/pub/people/dhozac/p/k/delta-owner-xid-feat02.diff
 Patch37:	kernel-owner-xid.patch
 
@@ -356,9 +358,9 @@
 Patch5001:	linux-2.6-apparmor-caps.patch
 
 # for rescuecd
-# http://ftp.leg.uct.ac.za/pub/linux/rip/inittmpfs-2.6.14.diff.gz
+# based on http://ftp.leg.uct.ac.za/pub/linux/rip/inittmpfs-2.6.14.diff.gz
 Patch7000:	kernel-inittmpfs.patch
-# http://www.udpcast.linux.lu/download/bzip2-lzma-kernel-2.6.23.12.patch.gz
+# based on http://www.udpcast.linux.lu/download/bzip2-lzma-kernel-2.6.23.12.patch.gz
 Patch7001:	kernel-bzip2-lzma.patch
 
 # not ready yet
@@ -818,6 +820,9 @@
 # kernel-pom-ng-rpc.patch
 %patch23 -p1
 
+# kernel-nf_rtsp.patch
+%patch36 -p1
+
 # kernel-owner-xid.patch
 %if %{with vserver}
 %patch37 -p1
@@ -1670,6 +1675,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1852  2008-03-13 19:31:51  zbyniu
+- rtsp-conntrack/nat is back
+
 Revision 1.441.2.1851  2008-03-13 16:16:03  zbyniu
 - kill more modules if with rescuecd
 
================================================================

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