SOURCES (LINUX_2_6_22): kernel-nf_rtsp.patch - cleanups

[zbyniu]

Author: zbyniu                       Date: Thu Mar 13 21:26:53 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6_22
---- Log message:
- cleanups

---- Files affected:
SOURCES:
   kernel-nf_rtsp.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-nf_rtsp.patch
diff -u SOURCES/kernel-nf_rtsp.patch:1.1.2.1 SOURCES/kernel-nf_rtsp.patch:1.1.2.2
--- SOURCES/kernel-nf_rtsp.patch:1.1.2.1	Thu Mar 13 22:26:00 2008
+++ SOURCES/kernel-nf_rtsp.patch	Thu Mar 13 22:26:47 2008
@@ -298,21 +298,14 @@
 diff -urN linux-2.6.21-rc7/net/ipv4/netfilter/Makefile linux-2.6.21-rc7.rtsp/net/ipv4/netfilter/Makefile
 --- linux-2.6.21-rc7/net/ipv4/netfilter/Makefile	2007-04-18 23:26:10.000000000 +0200
 +++ linux-2.6.21-rc7.rtsp/net/ipv4/netfilter/Makefile	2007-04-18 21:17:33.000000000 +0200
-@@ -64,6 +66,7 @@
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
+@@ -0,0 +0,1 @@
 +obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 diff -urN linux-2.6.21-rc7/net/netfilter/Kconfig linux-2.6.21-rc7.rtsp/net/netfilter/Kconfig
 --- linux-2.6.21-rc7/net/netfilter/Kconfig	2007-04-18 23:26:10.000000000 +0200
 +++ linux-2.6.21-rc7.rtsp/net/netfilter/Kconfig	2007-04-18 22:25:13.000000000 +0200
-@@ -271,6 +272,16 @@
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
+ 	  If you want to compile it as a module, say M here and read
+ 	  <file:Documentation/modules.txt>.  If unsure, say `Y'.
+ 	
 +config NF_CONNTRACK_RTSP
 +	tristate "RTSP protocol support"
 +	depends on NF_CONNTRACK
@@ -329,14 +322,8 @@
 diff -urN linux-2.6.21-rc7/net/netfilter/Makefile linux-2.6.21-rc7.rtsp/net/netfilter/Makefile
 --- linux-2.6.21-rc7/net/netfilter/Makefile	2007-04-18 23:26:10.000000000 +0200
 +++ linux-2.6.21-rc7.rtsp/net/netfilter/Makefile	2007-04-18 21:17:33.000000000 +0200
-@@ -32,6 +32,7 @@
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
+@@ -0,0 +0,1 @@
 +obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # generic X tables 
- obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
 --- linux-2.6.22.1/net/ipv4/netfilter/Kconfig.orig	2007-07-29 23:57:51.000000000 +0200
 +++ linux-2.6.22.1/net/ipv4/netfilter/Kconfig	2007-07-30 00:00:19.000000000 +0200
 @@ -274,6 +274,11 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-nf_rtsp.patch?r1=1.1.2.1&r2=1.1.2.2&f=u