CVS setup questions

I have tried to setup CVS integration for my project, that was working
perfectly ok with CVS for 3.0.5

I got into several problems, that can't resolve

1. My project are using tunneled access to cvs. CVS_RSH looks like
CVS_RSH=ssh -p port_number -l user_login

How to setup similar access in Aurora (#859)

2. I have two CVS roots in project - one external, and one local.
How can I setup them in Aurora

Thanks in advance

Sergey Yevtushenko