2.4.22-pre9 and pending patches issues
Hi,
Sorry if this is a no-brainer but I have not been able to apply 57_conntrack-tcp-nopickup.patch to the newest 2.4.22-pre9 kernel. Does anyone have a quick solution or do I have to merge manually? 39_ip_conntrack-proc.patch 40_nf-log.patch 54_ip_nat-macro-args.patch 55_ipt_unclean-tcp-flag-table.patch, all to apply more or less cleanly to the newest drop.
Also the tcp-window-tracking patch is not applicable to this kernel. I reckon this is because 57_* doesn't apply. I haven't looked further into this.
In case you're interested:
# patch -p1 --dry-run < ../patches/tcp-window-tracking.patch patching file include/linux/netfilter_ipv4/ip_conntrack_tcp.h patching file include/linux/sysctl.h Hunk #1 FAILED at 359. 1 out of 1 hunk FAILED -- saving rejects to file include/linux/sysctl.h.rej patching file net/ipv4/netfilter/ip_conntrack_ftp.c patching file net/ipv4/netfilter/ip_conntrack_irc.c Hunk #2 succeeded at 108 (offset 2 lines). patching file net/ipv4/netfilter/ip_conntrack_proto_tcp.c Hunk #2 FAILED at 24. Hunk #3 succeeded at 320 (offset 1 line). Hunk #4 FAILED at 712. Hunk #5 FAILED at 791. 3 out of 5 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_proto_tcp.c.rej patching file net/ipv4/netfilter/ip_conntrack_standalone.c Hunk #1 FAILED at 259. Hunk #2 FAILED at 307. Hunk #3 succeeded at 315 (offset -4 lines). 2 out of 3 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_standalone.c.rej patching file net/ipv4/netfilter/ip_nat_helper.c Hunk #1 succeeded at 456 (offset -5 lines).
I'll start merging by hand now ... unless someone beats me to it.
Best regards,
Roberto Nibali, ratz
Signature · 1 line
echo '[q]sa[ln0=aln256%Pln256/snlbx]sb3135071790101768542287578439snlbxq' | dc
Quoted 10 lines · Roberto Nibali
Hi,
Sorry if this is a no-brainer but I have not been able to apply 57_conntrack-tcp-nopickup.patch to the newest 2.4.22-pre9 kernel. Does anyone have a quick solution or do I have to merge manually? 39_ip_conntrack-proc.patch 40_nf-log.patch 54_ip_nat-macro-args.patch 55_ipt_unclean-tcp-flag-table.patch, all to apply more or less cleanly to the newest drop.
Also the tcp-window-tracking patch is not applicable to this kernel. I reckon this is because 57_* doesn't apply. I haven't looked further into this.
I'll look into it tonight.
When stuff like this happens it's usually because of another change in that kernel that modified a file we also want to modify. It's a major pain when that happens since it makes it harder to support both older kernels and newer kernels with the same patch.
/Martin
Quoted 1 line
I'll look into it tonight.
Thanks.
Quoted 4 lines
When stuff like this happens it's usually because of another change in that kernel that modified a file we also want to modify. It's a major pain when that happens since it makes it harder to support both older kernels and newer kernels with the same patch.
<OT>
I know the feelings, been there done that. I'll see what I can do since this week my task is to finally get a working 2.4.x kernel for our distribution ;). </OT>
TIA and best regards,
Roberto Nibali, ratz
Signature · 1 line
echo '[q]sa[ln0=aln256%Pln256/snlbx]sb3135071790101768542287578439snlbxq' | dc
Hi Martin,
Quoted 1 line
I'll look into it tonight.
I've solved it myself by engaging my brain. I did a very stupid mistake: I cat'd all pending patches into one patch and tried to apply this one, instead of applying every single one. Now it works with some minor/major offsets.
I can also successfully apply the tcp-window-tracking patch on top of the pending patches. I apologize to you for the waste of time and to the list for the waste of electrons.
You still might to rediff the pending patches ;).
Best regards and a quiet evening,
Roberto Nibali, ratz
Signature · 1 line
echo '[q]sa[ln0=aln256%Pln256/snlbx]sb3135071790101768542287578439snlbxq' | dc