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

[zbyniu]

Author: zbyniu                       Date: Thu Mar 13 21:15:15 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- rtsp-conntrack/nat is back

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.65 -> 1.441.2.1796.2.66) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.65 SPECS/kernel.spec:1.441.2.1796.2.66
--- SPECS/kernel.spec:1.441.2.1796.2.65	Sat Mar  8 12:02:53 2008
+++ SPECS/kernel.spec	Thu Mar 13 22:15:09 2008
@@ -9,7 +9,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)
@@ -104,7 +103,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			3
+%define		_rel			4
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_enable_debug_packages			0
@@ -224,6 +223,9 @@
 # fix in kernel abi handling for gcc 4.3 produced binaries
 Patch35:	kernel-df-signal.patch
 
+# based on http://mike.it-loops.com/rtsp/rtsp-2.6.22.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
 
@@ -828,6 +830,9 @@
 # kernel-df-signal.patch
 %patch35 -p0
 
+# kernel-nf_rtsp.patch
+%patch36 -p1
+
 # kernel-owner-xid.patch
 %if %{with vserver}
 %patch37 -p1
@@ -1712,6 +1717,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.66  2008-03-13 21:15:09  zbyniu
+- rtsp-conntrack/nat is back
+
 Revision 1.441.2.1796.2.65  2008-03-08 11:02:53  arekm
 - rel 3; df flag handling fix (gcc 4.3 produced binaries can trigger this bug sometimes)
 
================================================================

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