[Asterisk-Users] BroadVoice patch on latest CVS snapshot

[Jon Miron]

Hey,

I'm trying to patch the latest CVS snapshot with the BroadVoice patch
but I get this when I try:

root at xero:/usr/src/asterisk/channels# patch chan_sip.c sip_patch.diff
patching file chan_sip.c
Hunk #1 FAILED at 213.
Hunk #2 succeeded at 315 (offset 9 lines).
Hunk #3 FAILED at 485.
Hunk #4 FAILED at 493.
Hunk #5 succeeded at 3986 (offset 20 lines).
Hunk #6 succeeded at 3996 (offset 9 lines).
Hunk #7 succeeded at 4027 (offset 20 lines).
Hunk #8 succeeded at 4051 with fuzz 2 (offset 12 lines).
Hunk #9 succeeded at 4101 (offset 21 lines).
Hunk #10 succeeded at 4108 (offset 12 lines).
Hunk #11 succeeded at 4147 (offset 21 lines).
Hunk #12 succeeded at 4153 (offset 12 lines).
Hunk #13 succeeded at 4276 (offset 21 lines).
Hunk #14 succeeded at 6271 (offset 56 lines).
Hunk #15 succeeded at 6360 (offset 21 lines).
Hunk #16 succeeded at 6810 (offset 58 lines).
Hunk #17 FAILED at 6844.
4 out of 17 hunks FAILED -- saving rejects to file chan_sip.c.rej

Any ideas on what I can do?  Giving my box an external IP and avoiding
the patch completetly is an option, but I'd rather leave it NATed. 
Thanks in advance!