Here is a patchset that updates cvs to 1.11.22, which means some bugfixes. I have not throughly tested it yet.

http://people.freebsd.org/~delphij/misc/patch-cvs-1.11.22.diff

Note that a final update would be more complex than this one.