Messages in this thread Patch in this message | | | Subject | Re: Linux 2.4.21-rc1 | From | Martin Josefsson <> | Date | 25 Apr 2003 16:27:28 +0200 |
| |
On Fri, 2003-04-25 at 16:15, Andreas Metzler wrote: > Marcelo Tosatti <marcelo@conectiva.com.br> wrote: > > Here goes the first candidate for 2.4.21. > > > Please test it extensively. > > I'd love to, but the problem reported in > > Subject: [2.4.21-pre5] compile error in ip_conntrack_ftp.c:440: > Date: Wed, 5 Mar 2003 12:56:37 +0000 (UTC) > Message-ID: <b44s65$pdl$1@main.gmane.org> > http://www.ussg.iu.edu/hypermail/linux/kernel/0303.0/1008.html > > still applies - I cannot compile the kernel.
I have a fix for this. I just have to get it approved before I can submit it. It should make it possible for you to compile with your config.
It's attached.
-- /Martin diff -urN linux-2.4.21-pre7-bk.orig/net/ipv4/netfilter/Makefile linux-2.4.21-pre7-bk/net/ipv4/netfilter/Makefile --- linux-2.4.21-pre7-bk.orig/net/ipv4/netfilter/Makefile 2003-04-14 02:42:11.000000000 +0200 +++ linux-2.4.21-pre7-bk/net/ipv4/netfilter/Makefile 2003-04-14 02:42:44.000000000 +0200 @@ -31,27 +31,25 @@ # connection tracking obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o -# Amanda protocol support +# connection tracking helpers obj-$(CONFIG_IP_NF_AMANDA) += ip_conntrack_amanda.o -obj-$(CONFIG_IP_NF_NAT_AMANDA) += ip_nat_amanda.o -ifdef CONFIG_IP_NF_NAT_AMANDA +ifdef CONFIG_IP_NF_AMANDA export-objs += ip_conntrack_amanda.o endif - -# connection tracking helpers obj-$(CONFIG_IP_NF_TFTP) += ip_conntrack_tftp.o obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o -ifdef CONFIG_IP_NF_NAT_FTP +ifdef CONFIG_IP_NF_FTP export-objs += ip_conntrack_ftp.o endif obj-$(CONFIG_IP_NF_IRC) += ip_conntrack_irc.o -ifdef CONFIG_IP_NF_NAT_IRC +ifdef CONFIG_IP_NF_IRC export-objs += ip_conntrack_irc.o endif # NAT helpers +obj-$(CONFIG_IP_NF_NAT_AMANDA) += ip_nat_amanda.o obj-$(CONFIG_IP_NF_NAT_TFTP) += ip_nat_tftp.o obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o diff -urN linux-2.4.21-pre7-bk.orig/net/ipv4/netfilter/ip_conntrack_amanda.c linux-2.4.21-pre7-bk/net/ipv4/netfilter/ip_conntrack_amanda.c --- linux-2.4.21-pre7-bk.orig/net/ipv4/netfilter/ip_conntrack_amanda.c 2003-04-14 02:42:11.000000000 +0200 +++ linux-2.4.21-pre7-bk/net/ipv4/netfilter/ip_conntrack_amanda.c 2003-04-14 02:42:44.000000000 +0200 @@ -229,5 +229,7 @@ return 0; } +EXPORT_SYMBOL(ip_amanda_lock); + module_init(init); module_exit(fini); diff -urN linux-2.4.21-pre7-bk.orig/net/ipv4/netfilter/ip_conntrack_ftp.c linux-2.4.21-pre7-bk/net/ipv4/netfilter/ip_conntrack_ftp.c --- linux-2.4.21-pre7-bk.orig/net/ipv4/netfilter/ip_conntrack_ftp.c 2003-04-14 02:42:02.000000000 +0200 +++ linux-2.4.21-pre7-bk/net/ipv4/netfilter/ip_conntrack_ftp.c 2003-04-14 02:42:44.000000000 +0200 @@ -436,9 +436,7 @@ return 0; } -#ifdef CONFIG_IP_NF_NAT_NEEDED EXPORT_SYMBOL(ip_ftp_lock); -#endif MODULE_LICENSE("GPL"); module_init(init); diff -urN linux-2.4.21-pre7-bk.orig/net/ipv4/netfilter/ip_conntrack_irc.c linux-2.4.21-pre7-bk/net/ipv4/netfilter/ip_conntrack_irc.c --- linux-2.4.21-pre7-bk.orig/net/ipv4/netfilter/ip_conntrack_irc.c 2002-11-29 00:53:15.000000000 +0100 +++ linux-2.4.21-pre7-bk/net/ipv4/netfilter/ip_conntrack_irc.c 2003-04-14 02:42:44.000000000 +0200 @@ -305,9 +305,7 @@ } } -#ifdef CONFIG_IP_NF_NAT_NEEDED EXPORT_SYMBOL(ip_irc_lock); -#endif module_init(init); module_exit(fini); | |