[vpnc-devel] merge vpnc-nortel with trunk (phase 1)

[Mike Gofman]

Ough wow.
Finally someone is working on what's been missing for so long.

Zingo Andersen wrote:
> Hello
>
> I have merged in latest from trunk to my vpnc-nortel setup and manage to get it usable
> I tried to re-struct it back as much as possible to follow the trunk code base.
> I tried to put all important difference behind a build flag ( NORTELVPN ) so that
> the code for nortel and non nortel could coexist e.g. the branch could be removed.
> ( Well maybe after some more code cleanup. )
>
> The latest fix on vpnc-nortel branch did breake my setup so I have put it
> under another build flag ( NORTELVPN_XAUTHTYPE_AS_REQUEST ) until someone know
> how to fix it.
>
> I don't know anything about VPN stuff so my remaining difference might be done better
> please let me know.
>
> Next step would be better cleanup and if possible a runtime check instead of this
> "#ifdef NORTELVPN" madness. The Idea was to bring it up to par with trunk so that
> someone that knows the code could look at it merge it in easier or give more
> instruction on what needs to be fixed.
>
> I have put all my file and a patch file against vpnc-nortel
> on my website, since the patch is rather big (changes from 43 to 284)
> I don't know what should be easier to use if it should be applied.
> I recommend using the file list instead of the patch and check it
> against trunk:284
>
> vpnc-nortel merged with trunk/284 (latest of today 20080203)
>
> All files:
> http://www.zingo.org/webtest/vpnc-nortel_merge_with_284.tar.gz
>
> Or a patch on latest vpnc-nortel to bring it up to 284 (lots of changes)
>
> http://www.zingo.org/webtest/vpnc-nortel_merge_with_284.patch
>
> Hope this make anyone happy :)
>
>