Mr. Josefsson,
--- Martin Josefsson <[EMAIL PROTECTED]> wrote:
> On Sun, 2002-04-21 at 00:21, Brad Chapman wrote:
> > Everyone,
> >
> > In the current CVS repository, the 0-newnat13.patch appears to have
> > been very badly broken - it doesn't apply at all to a fresh, untouched 2.4.18
> > tarball. About three days ago, the patch was OK. Has something been corrupted
> > in the 2.4.18 tarballs, the patch, both, or neither?
>
> It's not bandly broken, it's just been updated to apply to 2.4.19-pre6
> and -pre7 as these add arp_tables to netfilter.
>
> It's just one hunk that's been changed, I know you can fix this by hand
> as you've been around here for quite some time.
>
> Please don't complain that the version in CVS doesn't apply to 2.4.18
> which is getting quite old in development terms, the time between
> 2.4-series releases is getting longer and longer (as it should with a
> stable series) and it's unreasonable to expect the netfilter CVS not to
> move between kernel releases.
I'm aware of this. I understand that things can't stand still for
the CVS releases. But here is the output of the command
"patch -p1 < 0-newnat13.patch" in the tarball root directory of a freshly
unpacked 2.4.18 kernel, straight from kernel.org:
patching file include/linux/netfilter_ipv4/ip_conntrack.h
Hunk #2 FAILED at 63.
Hunk #3 succeeded at 136 (offset 3 lines).
Hunk #4 FAILED at 159.
Hunk #5 succeeded at 177 (offset 2 lines).
2 out of 5 hunks FAILED -- saving rejects to file
include/linux/netfilter_ipv4/ip_conntrack.h.rej
patching file include/linux/netfilter_ipv4/ip_conntrack_core.h
patching file include/linux/netfilter_ipv4/ip_conntrack_ftp.h
patching file include/linux/netfilter_ipv4/ip_conntrack_helper.h
patching file include/linux/netfilter_ipv4/ip_conntrack_irc.h
patching file include/linux/netfilter_ipv4/ip_conntrack_protocol.h
Hunk #1 succeeded at 42 with fuzz 2 (offset -3 lines).
patching file include/linux/netfilter_ipv4/ip_nat_helper.h
patching file include/linux/netfilter_ipv4/ip_nat_rule.h
patching file net/ipv4/netfilter/Makefile
Hunk #1 FAILED at 9.
Hunk #2 FAILED at 33.
2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/Makefile.rej
patching file net/ipv4/netfilter/ip_conntrack_core.c
Hunk #7 FAILED at 231.
Hunk #8 succeeded at 448 (offset -8 lines).
Hunk #10 succeeded at 588 (offset -8 lines).
Hunk #12 succeeded at 749 (offset -8 lines).
Hunk #14 succeeded at 1014 (offset -8 lines).
Hunk #16 succeeded at 1322 (offset -8 lines).
1 out of 16 hunks FAILED -- saving rejects to file
net/ipv4/netfilter/ip_conntrack_core.c.rej
patching file net/ipv4/netfilter/ip_conntrack_ftp.c
patching file net/ipv4/netfilter/ip_conntrack_irc.c
Hunk #2 FAILED at 36.
1 out of 7 hunks FAILED -- saving rejects to file
net/ipv4/netfilter/ip_conntrack_irc.c.rej
patching file net/ipv4/netfilter/ip_conntrack_proto_generic.c
Hunk #1 FAILED at 57.
1 out of 1 hunk FAILED -- saving rejects to file
net/ipv4/netfilter/ip_conntrack_proto_generic.c.rej
patching file net/ipv4/netfilter/ip_conntrack_proto_icmp.c
Hunk #1 FAILED at 113.
1 out of 1 hunk FAILED -- saving rejects to file
net/ipv4/netfilter/ip_conntrack_proto_icmp.c.rej
patching file net/ipv4/netfilter/ip_conntrack_proto_tcp.c
Hunk #2 FAILED at 230.
1 out of 2 hunks FAILED -- saving rejects to file
net/ipv4/netfilter/ip_conntrack_proto_tcp.c.rej
patching file net/ipv4/netfilter/ip_conntrack_proto_udp.c
Hunk #1 FAILED at 71.
1 out of 1 hunk FAILED -- saving rejects to file
net/ipv4/netfilter/ip_conntrack_proto_udp.c.rej
patching file net/ipv4/netfilter/ip_conntrack_standalone.c
Hunk #1 succeeded at 56 (offset -6 lines).
Hunk #2 FAILED at 314.
Hunk #3 FAILED at 353.
2 out of 3 hunks FAILED -- saving rejects to file
net/ipv4/netfilter/ip_conntrack_standalone.c.rej
patching file net/ipv4/netfilter/ip_fw_compat_masq.c
patching file net/ipv4/netfilter/ip_nat_core.c
Hunk #3 succeeded at 626 (offset -7 lines).
Hunk #5 succeeded at 749 (offset -7 lines).
patching file net/ipv4/netfilter/ip_nat_ftp.c
patching file net/ipv4/netfilter/ip_nat_helper.c
patching file net/ipv4/netfilter/ip_nat_irc.c
patching file net/ipv4/netfilter/ip_nat_proto_tcp.c
patching file net/ipv4/netfilter/ip_nat_proto_unknown.c
patching file net/ipv4/netfilter/ip_nat_rule.c
Hunk #2 succeeded at 240 (offset -12 lines).
patching file net/ipv4/netfilter/ip_nat_snmp_basic.c
patching file net/ipv4/netfilter/ip_nat_standalone.c
Hunk #2 succeeded at 48 with fuzz 2 (offset -1 lines).
Hunk #3 succeeded at 118 (offset -6 lines).
Hunk #4 FAILED at 350.
1 out of 4 hunks FAILED -- saving rejects to file
net/ipv4/netfilter/ip_nat_standalone.c.rej
It would appear that something has changed
>
> --
> /Martin
>
Brad
=====
Brad Chapman
Permanent e-mail: [EMAIL PROTECTED]
Current e-mail: [EMAIL PROTECTED]
Alternate e-mail: [EMAIL PROTECTED]
__________________________________________________
Do You Yahoo!?
Yahoo! Games - play chess, backgammon, pool and more
http://games.yahoo.com/
