SOURCES: kernel-nf_rtsp.patch - cleanups

[zbyniu]

Author: zbyniu                       Date: Thu Mar 13 19:34:33 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- cleanups

---- Files affected:
SOURCES:
   kernel-nf_rtsp.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-nf_rtsp.patch
diff -u SOURCES/kernel-nf_rtsp.patch:1.1 SOURCES/kernel-nf_rtsp.patch:1.2
--- SOURCES/kernel-nf_rtsp.patch:1.1	Thu Mar 13 20:33:29 2008
+++ SOURCES/kernel-nf_rtsp.patch	Thu Mar 13 20:34:28 2008
@@ -246,21 +246,15 @@
 diff -purN linux-2.6.23-rc2.orig/net/ipv4/netfilter/Makefile linux-2.6.23-rc2/net/ipv4/netfilter/Makefile
 --- linux-2.6.23-rc2.orig/net/ipv4/netfilter/Makefile	2007-08-05 21:14:19.000000000 +0200
 +++ linux-2.6.23-rc2/net/ipv4/netfilter/Makefile	2007-08-05 10:53:55.000000000 +0200
-@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- 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_AMANDA) += nf_nat_am
 +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 -purN linux-2.6.23-rc2.orig/net/netfilter/Kconfig linux-2.6.23-rc2/net/netfilter/Kconfig
 --- linux-2.6.23-rc2.orig/net/netfilter/Kconfig	2007-08-05 21:17:02.000000000 +0200
 +++ linux-2.6.23-rc2/net/netfilter/Kconfig	2007-08-05 11:04:59.000000000 +0200
-@@ -249,6 +249,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
+@@ -249,6 +249,16 @
+ 	  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
@@ -277,14 +271,8 @@
 diff -purN linux-2.6.23-rc2.orig/net/netfilter/Makefile linux-2.6.23-rc2/net/netfilter/Makefile
 --- linux-2.6.23-rc2.orig/net/netfilter/Makefile	2007-08-05 21:17:02.000000000 +0200
 +++ linux-2.6.23-rc2/net/netfilter/Makefile	2007-08-05 11:04:59.000000000 +0200
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- 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
 diff -purN linux-2.6.24-rc1.orig/include/linux/netfilter/nf_conntrack_rtsp.h linux-2.6.24-rc1/include/linux/netfilter/nf_conntrack_rtsp.h
 --- linux-2.6.24-rc1.orig/include/linux/netfilter/nf_conntrack_rtsp.h	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.24-rc1/include/linux/netfilter/nf_conntrack_rtsp.h	2007-11-10 17:16:36.000000000 +0100
================================================================

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