[Openswan Users] kernel patch NAT TRAVERSAL

[vpn]

I am trying to patch linux-2.6.22.19. I am following the instructions on 
the wiki http://wiki.openswan.org/index.php/BuildingFromTarballsFor2/6 
and/or the openswan book chapter 3. I have tried version 2.4.10, 2.4.12, 
2.5.17 and 2.6.10. They all fail with similar output.

dev64:/usr/src# cd openswan-2.4.12
dev64:/usr/src/openswan-2.4.12# make nattpatch > 
/usr/src/openswan-ipsec-natt.diff
dev64:/usr/src/openswan-2.4.12# cd ../linux
dev64:/usr/src/linux# cat ../openswan-ipsec-natt.diff | patch -p1
patching file include/net/xfrmudp.h
patching file net/ipv4/Kconfig
Hunk #1 succeeded at 351 with fuzz 1.
patching file net/ipv4/udp.c
Hunk #1 succeeded at 110 with fuzz 1.
Hunk #2 succeeded at 922 with fuzz 2 (offset 25 lines).
Hunk #3 FAILED at 965.
Hunk #4 FAILED at 1085.
Hunk #5 FAILED at 1182.
Hunk #6 succeeded at 1784 (offset 171 lines).
3 out of 6 hunks FAILED -- saving rejects to file net/ipv4/udp.c.rej

dev64:/usr/src# cd openswan-2.5.17
dev64:/usr/src/openswan-2.5.17# make nattpatch > 
/usr/src/openswan-ipsec-natt.diff
dev64:/usr/src/openswan-2.5.17# cd ../linux
dev64:/usr/src/linux# cat ../openswan-ipsec-natt.diff | patch -p1
patching file include/net/xfrmudp.h
patching file net/ipv4/Kconfig
Hunk #1 succeeded at 351 with fuzz 1.
patching file net/ipv4/udp.c
Hunk #1 FAILED at 108.
Hunk #2 succeeded at 920 with fuzz 2 (offset 38 lines).
Hunk #3 FAILED at 952.
Hunk #4 FAILED at 1082.
Hunk #5 FAILED at 1191.
Hunk #6 succeeded at 1784 (offset 143 lines).
4 out of 6 hunks FAILED -- saving rejects to file net/ipv4/udp.c.rej

dev64:/usr/src# cd openswan-2.6.10
dev64:/usr/src/openswan-2.6.10# make nattpatch > 
/usr/src/openswan-ipsec-natt.diff
dev64:/usr/src/openswan-2.6.10# cd ../linux
dev64:/usr/src/linux# cat ../openswan-ipsec-natt.diff | patch -p1
patching file include/net/xfrmudp.h
patching file net/ipv4/Kconfig
Hunk #1 succeeded at 351 with fuzz 1.
patching file net/ipv4/udp.c
Hunk #1 FAILED at 108.
Hunk #2 succeeded at 920 with fuzz 2 (offset 38 lines).
Hunk #3 FAILED at 952.
Hunk #4 FAILED at 1082.
Hunk #5 FAILED at 1191.
Hunk #6 succeeded at 1784 (offset 143 lines).
4 out of 6 hunks FAILED -- saving rejects to file net/ipv4/udp.c.rej

I have searched for hours and found nothing helpful. I did read
lists.openswan.org/pipermail/users/2007-November.txt.gz , which 
indicated that it should apply.